moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

deal with negative Content-Length: headers by ignoring the info

This commit is contained in:
Daniel Stenberg 2004-07-16 21:01:16 +00:00
parent 0359ae8f40
commit cd2e99e980
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/transfer.c
View File

@ -668,12 +668,21 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if ((k->httpcode != 416) && if ((k->httpcode != 416) &&
checkprefix("Content-Length:", k->p)) { checkprefix("Content-Length:", k->p)) {
contentlength = curlx_strtoofft(k->p+15, NULL, 10); contentlength = curlx_strtoofft(k->p+15, NULL, 10);
if (data->set.max_filesize && contentlength > if (data->set.max_filesize &&
data->set.max_filesize) { contentlength > data->set.max_filesize) {
failf(data, "Maximum file size exceeded"); failf(data, "Maximum file size exceeded");
return CURLE_FILESIZE_EXCEEDED; return CURLE_FILESIZE_EXCEEDED;
} }
conn->size = contentlength; if(contentlength >= 0)
conn->size = contentlength;
else {
/* Negative Content-Length is really odd, and we know it
happens for example when older Apache servers send large
files */
conn->bits.close = TRUE;
infof(data, "Negative content-length: %" FORMAT_OFF_T
", closing after transfer\n", contentlength);
}
} }
/* check for Content-Type: header lines to get the mime-type */ /* check for Content-Type: header lines to get the mime-type */
else if (checkprefix("Content-Type:", k->p)) { else if (checkprefix("Content-Type:", k->p)) {
@ -1278,15 +1287,15 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if(Curl_pgrsUpdate(conn)) if(Curl_pgrsUpdate(conn))
result = CURLE_ABORTED_BY_CALLBACK; result = CURLE_ABORTED_BY_CALLBACK;
else else
result = Curl_speedcheck (data, k->now); result = Curl_speedcheck(data, k->now);
if (result) if (result)
return result; return result;
if (data->set.timeout && if (data->set.timeout &&
((Curl_tvdiff(k->now, k->start)/1000) >= data->set.timeout)) { ((Curl_tvdiff(k->now, k->start)/1000) >= data->set.timeout)) {
failf (data, "Operation timed out with %" FORMAT_OFF_T failf(data, "Operation timed out with %" FORMAT_OFF_T
" out of %" FORMAT_OFF_T " bytes received", " out of %" FORMAT_OFF_T " bytes received",
k->bytecount, conn->size); k->bytecount, conn->size);
return CURLE_OPERATION_TIMEOUTED; return CURLE_OPERATION_TIMEOUTED;
} }