mirror of https://github.com/moparisthebest/curl
fixed the 304 response-with-content-length problem reported by Cory Nelson
This commit is contained in:
parent
a9b7c3531c
commit
fb3c85ab2f
|
@ -697,6 +697,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
|
||||||
* fields. */
|
* fields. */
|
||||||
conn->size=0;
|
conn->size=0;
|
||||||
conn->maxdownload=0;
|
conn->maxdownload=0;
|
||||||
|
k->ignorecl = TRUE; /* ignore Content-Length headers */
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* nothing */
|
/* nothing */
|
||||||
|
@ -713,7 +714,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
|
||||||
the header completely if we get a 416 response as then we're
|
the header completely if we get a 416 response as then we're
|
||||||
resuming a document that we don't get, and this header contains
|
resuming a document that we don't get, and this header contains
|
||||||
info about the true size of the document we didn't get now. */
|
info about the true size of the document we didn't get now. */
|
||||||
if ((k->httpcode != 416) &&
|
if (!k->ignorecl &&
|
||||||
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 &&
|
if (data->set.max_filesize &&
|
||||||
|
|
|
@ -494,6 +494,8 @@ struct Curl_transfer_keeper {
|
||||||
and we're uploading the last chunk */
|
and we're uploading the last chunk */
|
||||||
|
|
||||||
bool ignorebody; /* we read a response-body but we ignore it! */
|
bool ignorebody; /* we read a response-body but we ignore it! */
|
||||||
|
bool ignorecl; /* This HTTP response has no body so we ignore the Content-
|
||||||
|
Length: header */
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME) || \
|
#if defined(USE_ARES) || defined(USE_THREADING_GETHOSTBYNAME) || \
|
||||||
|
|
|
@ -33,7 +33,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
|
||||||
test241 test242 test519 test214 test215 test216 test217 test218 \
|
test241 test242 test519 test214 test215 test216 test217 test218 \
|
||||||
test199 test225 test226 test227 test230 test231 test232 test228 \
|
test199 test225 test226 test227 test230 test231 test232 test228 \
|
||||||
test229 test233 test234 test235 test236 test520 test237 test238 \
|
test229 test233 test234 test235 test236 test520 test237 test238 \
|
||||||
test239 test243 test245 test246 test247 test248
|
test239 test243 test245 test246 test247 test248 test249
|
||||||
|
|
||||||
# The following tests have been removed from the dist since they no longer
|
# The following tests have been removed from the dist since they no longer
|
||||||
# work. We need to fix the test suite's FTPS server first, then bring them
|
# work. We need to fix the test suite's FTPS server first, then bring them
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
#
|
||||||
|
# Server-side
|
||||||
|
<reply>
|
||||||
|
<data>
|
||||||
|
HTTP/1.1 304 Not Modified swsclose
|
||||||
|
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||||
|
Server: test-server/fake
|
||||||
|
Last-Modified: Tue, 13 Jun 1910 12:10:00 GMT
|
||||||
|
ETag: "21025-dc7-39462498"
|
||||||
|
Accept-Ranges: bytes
|
||||||
|
Content-Length: 677777
|
||||||
|
Connection: close
|
||||||
|
Content-Type: text/html
|
||||||
|
|
||||||
|
</data>
|
||||||
|
</reply>
|
||||||
|
|
||||||
|
#
|
||||||
|
# Client-side
|
||||||
|
<client>
|
||||||
|
<server>
|
||||||
|
http
|
||||||
|
</server>
|
||||||
|
<name>
|
||||||
|
HTTP 304 response with "illegal" Content-Length: header
|
||||||
|
</name>
|
||||||
|
<command>
|
||||||
|
http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
|
||||||
|
</command>
|
||||||
|
</client>
|
||||||
|
|
||||||
|
#
|
||||||
|
# Verify data after the test has been "shot"
|
||||||
|
<verify>
|
||||||
|
<strip>
|
||||||
|
^User-Agent:.*
|
||||||
|
</strip>
|
||||||
|
<protocol>
|
||||||
|
GET /249 HTTP/1.1
|
||||||
|
Host: 127.0.0.1:%HTTPPORT
|
||||||
|
Pragma: no-cache
|
||||||
|
Accept: */*
|
||||||
|
If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
|
||||||
|
|
||||||
|
</protocol>
|
||||||
|
</verify>
|
Loading…
Reference in New Issue