diff options
author | Brandon Casey <drafnel@gmail.com> | 2014-08-29 23:48:03 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2014-09-07 23:23:12 +0200 |
commit | 6beb0eeea17cd6cc71cb69737ac63861a8f18d4e (patch) | |
tree | a3845f28b7cbf165d5340c045ec71bf0763b0bef /lib/http.c | |
parent | 8acbb074f8816156c250cd39c9ea53cbba670302 (diff) |
Ensure progress.size_dl/progress.size_ul are always >= 0
Historically the default "unknown" value for progress.size_dl and
progress.size_ul has been zero, since these values are initialized
implicitly by the calloc that allocates the curl handle that these
variables are a part of. Users of curl that install progress
callbacks may expect these values to always be >= 0.
Currently it is possible for progress.size_dl and progress.size_ul
to by set to a value of -1, if Curl_pgrsSetDownloadSize() or
Curl_pgrsSetUploadSize() are passed a "size" of -1 (which a few
places currently do, and a following patch will add more). So
lets update Curl_pgrsSetDownloadSize() and Curl_pgrsSetUploadSize()
so they make sure that these variables always contain a value that
is >= 0.
Updates test579 and test599.
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Diffstat (limited to 'lib/http.c')
-rw-r--r-- | lib/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http.c b/lib/http.c index 3fdab27ee..35baa3407 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2351,7 +2351,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) return result; http->postdata = NULL; /* nothing to post at this point */ - Curl_pgrsSetUploadSize(data, 0); /* upload size is 0 atm */ + Curl_pgrsSetUploadSize(data, -1); /* upload size is unknown atm */ /* If 'authdone' is FALSE, we must not set the write socket index to the Curl_transfer() call below, as we're not ready to actually upload any |