moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

http: fix the Content-Range: parser

Browse Source 
... to handle "*/[total]". Also, removed the strange hack that made
CURLOPT_FAILONERROR on a 416 response after a *RESUME_FROM return
CURLE_OK.

Reported-by: Dimitrios Siganos
Bug: http://curl.haxx.se/mail/lib-2014-06/0221.html
This commit is contained in:
Daniel Stenberg 2014-08-14 16:43:24 +02:00
parent 472d1d8e05
commit 0187c9e11d
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/http.c
View File

@ -920,14 +920,6 @@ static int http_should_fail(struct connectdata *conn)
if(httpcode < 400) if(httpcode < 400)
return 0; return 0;
if(data->state.resume_from &&
(data->set.httpreq==HTTPREQ_GET) &&
(httpcode == 416)) {
/* "Requested Range Not Satisfiable", just proceed and
pretend this is no error */
return 0;
}
/* /*
** Any code >= 400 that's not 401 or 407 is always ** Any code >= 400 that's not 401 or 407 is always
** a terminal error ** a terminal error
@ -3539,23 +3531,30 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,
/* Content-Range: bytes [num]- /* Content-Range: bytes [num]-
Content-Range: bytes: [num]- Content-Range: bytes: [num]-
Content-Range: [num]- Content-Range: [num]-
Content-Range: [asterisk]/[total]
The second format was added since Sun's webserver The second format was added since Sun's webserver
JavaWebServer/1.1.1 obviously sends the header this way! JavaWebServer/1.1.1 obviously sends the header this way!
The third added since some servers use that! The third added since some servers use that!
The forth means the requested range was unsatisfied.
*/ */
char *ptr = k->p + 14; char *ptr = k->p + 14;
/* Move forward until first digit */ /* Move forward until first digit or asterisk */
while(*ptr && !ISDIGIT(*ptr)) while(*ptr && !ISDIGIT(*ptr) && *ptr != '*')
ptr++; ptr++;
k->offset = curlx_strtoofft(ptr, NULL, 10); /* if it truly stopped on a digit */
if(ISDIGIT(*ptr)) {
k->offset = curlx_strtoofft(ptr, NULL, 10);
if(data->state.resume_from == k->offset) if(data->state.resume_from == k->offset)
/* we asked for a resume and we got it */ /* we asked for a resume and we got it */
k->content_range = TRUE; k->content_range = TRUE;
}
else
data->state.resume_from = 0; /* get everything */
} }
#if !defined(CURL_DISABLE_COOKIES) #if !defined(CURL_DISABLE_COOKIES)
else if(data->cookies && else if(data->cookies &&

18
tests/data/test194
View File

@ -25,6 +25,19 @@ Connection: close
bad bad
</data> </data>
<datacheck>
HTTP/1.1 416 Requested Range Not Satisfiable swsclose
Date: Fri, 24 Oct 2003 21:33:12 GMT
Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
ETag: "ab57a-507-3f9968f3"
Accept-Ranges: bytes
Content-Length: 4
Content-Range: bytes */87
Content-Type: image/gif
Connection: close
</datacheck>
</reply> </reply>
# Client-side # Client-side
@ -52,6 +65,9 @@ Host: %HOSTIP:%HTTPPORT
Accept: */* Accept: */*
</protocol> </protocol>
# CURLE_HTTP_RETURNED_ERROR
<errorcode>
22
</errorcode>
</verify> </verify>
</testcase> </testcase>