diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2012-03-23 23:42:37 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-04-01 00:07:24 +0200 |
| commit | c44d45db86b880df5facd6b560491e03530f876e (patch) | |
| tree | 97fd94273ca7a3666b720286d2470e3accd5d263 /lib | |
| parent | 7a2647e16237a2771f564d432d96a6f198a0eeb5 (diff) | |
| download | curl-c44d45db86b880df5facd6b560491e03530f876e.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/progress.c | 9 | ||||
| -rw-r--r-- | lib/progress.h | 4 | ||||
| -rw-r--r-- | lib/transfer.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/progress.c b/lib/progress.c index 1eeb78052..4c9a63acb 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -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) diff --git a/lib/progress.h b/lib/progress.h index f5cc5403a..a41d5f92f 100644 --- a/lib/progress.h +++ b/lib/progress.h @@ -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); diff --git a/lib/transfer.c b/lib/transfer.c index d6061be58..d872719fa 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -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 */ |