Commit c44d45db authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

HTTP: reset expected DL/UL sizes on redirects 

With FOLLOWLOCATION enabled. When a 3xx page is downloaded and the
download size was known (like with a Content-Length header), but the
subsequent URL (transfered after the 3xx page) was chunked encoded, then
the previous "known download size" would linger and cause the progress
meter to get incorrect information, ie the former value would remain
being sent in. This could easily result in downloads that were WAY
larger than "expected" and would cause >100% outputs with the curl
command line tool.

Test case 599 was created and it was used to repeat the bug and then
verify the fix.

Bug: http://curl.haxx.se/bug/view.cgi?id=3510057
Reported by: Michael Wallner
parent 7a2647e1

lib/progress.c

+6 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -146,13 +146,16 @@ void Curl_pgrsDone(struct connectdata *conn) 
  data->progress.speeder_c = 0; /* reset the progress meter display */

}



/* reset all times except redirect */

void Curl_pgrsResetTimes(struct SessionHandle *data)

/* reset all times except redirect, and reset the known transfer sizes */

void Curl_pgrsResetTimesSizes(struct SessionHandle *data)

{

  data->progress.t_nslookup = 0.0;

  data->progress.t_connect = 0.0;

  data->progress.t_pretransfer = 0.0;

  data->progress.t_starttransfer = 0.0;



  Curl_pgrsSetDownloadSize(data, 0);

  Curl_pgrsSetUploadSize(data, 0);

}



void Curl_pgrsTime(struct SessionHandle *data, timerid timer)

lib/progress.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -46,7 +46,7 @@ void Curl_pgrsSetUploadSize(struct SessionHandle *data, curl_off_t size); 
void Curl_pgrsSetDownloadCounter(struct SessionHandle *data, curl_off_t size);

void Curl_pgrsSetUploadCounter(struct SessionHandle *data, curl_off_t size);

int Curl_pgrsUpdate(struct connectdata *);

void Curl_pgrsResetTimes(struct SessionHandle *data);

void Curl_pgrsResetTimesSizes(struct SessionHandle *data);

void Curl_pgrsTime(struct SessionHandle *data, timerid timer);

lib/transfer.c

+1 −1
Original line number Diff line number Diff line
@@ -1924,7 +1924,7 @@ CURLcode Curl_follow(struct SessionHandle *data, 
    break;

  }

  Curl_pgrsTime(data, TIMER_REDIRECT);

  Curl_pgrsResetTimes(data);

  Curl_pgrsResetTimesSizes(data);



  return CURLE_OK;

#endif /* CURL_DISABLE_HTTP */

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ test551 test552 test553 test554 test555 test556 test557 test560 test561 \ 
test562 test563 test564 test565 test566 test567 test568 test569 test570	\

test571 test572 test573 test574 test575 test576 test578 test579 test580	\

test581 test582 test583 test584 test585 test586 test587 test588 test590 \

test591 test592 test593 test594 test595 test596 test597 test598 \

test591 test592 test593 test594 test595 test596 test597 test598 test599 \

test600 test601 test602 test603 test604	\

test605 test606 test607 test608 test609 test610 test611 test612 test613	\

test614 test615 test616 test617 test618 test619 test620 test621 test622	\

tests/data/test599

0 → 100644
+83 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

HTTP

HTTP POST

</keywords>

</info>

#

# Server-side

<reply>

<data>

HTTP/1.1 302 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Location: 5990001

Content-Length: 6

Connection: close

Content-Type: text/html



-foo-

</data>

<data1>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Transfer-Encoding: chunked

Connection: close

Content-Type: text/html



32

this data is slightly larger than the first piece



0



</data1>



<datacheck>

HTTP/1.1 302 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Location: 5990001

Content-Length: 6

Connection: close

Content-Type: text/html



HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Transfer-Encoding: chunked

Connection: close

Content-Type: text/html



this data is slightly larger than the first piece

</datacheck>



</reply>



# Client-side

<client>

<server>

http

</server>

# tool is what to use instead of 'curl'

<tool>

lib599

</tool>



# Bug 3510057 pointed out that when following a location to a larger chunked

# encoded page, the first size would still be used in the progress callback

 <name>

HTTP GET with progress callback and redirects changing content sizes

 </name>

 <command>

http://%HOSTIP:%HTTPPORT/599

</command>

</client>



#

# Verify data after the test has been "shot"

<verify>



</verify>

</testcase>