Commit 0187c9e1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http: fix the Content-Range: parser 

... 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
parent 472d1d8e

lib/http.c

+13 −14
Original line number Diff line number Diff line
@@ -920,14 +920,6 @@ static int http_should_fail(struct connectdata *conn) 
  if(httpcode < 400)

    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

  ** a terminal error
@@ -3539,24 +3531,31 @@ CURLcode Curl_http_readwrite_headers(struct SessionHandle *data, 
      /* Content-Range: bytes [num]-

         Content-Range: bytes: [num]-

         Content-Range: [num]-

         Content-Range: [asterisk]/[total]



         The second format was added since Sun's webserver

         JavaWebServer/1.1.1 obviously sends the header this way!

         The third added since some servers use that!

         The forth means the requested range was unsatisfied.

      */



      char *ptr = k->p + 14;



      /* Move forward until first digit */

      while(*ptr && !ISDIGIT(*ptr))

      /* Move forward until first digit or asterisk */

      while(*ptr && !ISDIGIT(*ptr) && *ptr != '*')

        ptr++;



      /* if it truly stopped on a digit */

      if(ISDIGIT(*ptr)) {

        k->offset = curlx_strtoofft(ptr, NULL, 10);



        if(data->state.resume_from == k->offset)

          /* we asked for a resume and we got it */

          k->content_range = TRUE;

      }

      else

        data->state.resume_from = 0; /* get everything */

    }

#if !defined(CURL_DISABLE_COOKIES)

    else if(data->cookies &&

            checkprefix("Set-Cookie:", k->p)) {

tests/data/test194

+17 −1
Original line number Diff line number Diff line
@@ -25,6 +25,19 @@ Connection: close 
bad

</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>



# Client-side
@@ -52,6 +65,9 @@ Host: %HOSTIP:%HTTPPORT 
Accept: */*



</protocol>



# CURLE_HTTP_RETURNED_ERROR

<errorcode>

22

</errorcode>

</verify>

</testcase>