mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

file: don't provide content-length for directories

Browse Source 
... as it is misleading.

Ref #6379
Closes #6421
This commit is contained in:
Daniel Stenberg 2021-01-07 16:00:41 +01:00
parent a56f263cdc
commit 1e5cec3297
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/file.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -365,7 +365,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
struct_stat statbuf; /* struct_stat instead of struct stat just to allow the struct_stat statbuf; /* struct_stat instead of struct stat just to allow the
Windows version to have a different struct without Windows version to have a different struct without
having to redefine the simple word 'stat' */ having to redefine the simple word 'stat' */
curl_off_t expected_size = 0; curl_off_t expected_size = -1;
bool size_known; bool size_known;
bool fstated = FALSE; bool fstated = FALSE;
struct Curl_easy *data = conn->data; struct Curl_easy *data = conn->data;
@ -388,8 +388,8 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
/* VMS: This only works reliable for STREAMLF files */ /* VMS: This only works reliable for STREAMLF files */
if(-1 != fstat(fd, &statbuf)) { if(-1 != fstat(fd, &statbuf)) {
/* we could stat it, then read out the size */ if(!S_ISDIR(statbuf.st_mode))
expected_size = statbuf.st_size; expected_size = statbuf.st_size;
/* and store the modification time */ /* and store the modification time */
data->info.filetime = statbuf.st_mtime; data->info.filetime = statbuf.st_mtime;
fstated = TRUE; fstated = TRUE;
@ -407,12 +407,14 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
struct tm buffer; struct tm buffer;
const struct tm *tm = &buffer; const struct tm *tm = &buffer;
char header[80]; char header[80];
msnprintf(header, sizeof(header), if(expected_size >= 0) {
"Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", msnprintf(header, sizeof(header),
expected_size); "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n",
result = Curl_client_write(conn, CLIENTWRITE_HEADER, header, 0); expected_size);
if(result) result = Curl_client_write(conn, CLIENTWRITE_HEADER, header, 0);
return result; if(result)
return result;
}
result = Curl_client_write(conn, CLIENTWRITE_HEADER, result = Curl_client_write(conn, CLIENTWRITE_HEADER,
(char *)"Accept-ranges: bytes\r\n", 0); (char *)"Accept-ranges: bytes\r\n", 0);