diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-03-10 14:07:38 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-03-11 23:54:25 +0100 |
| commit | 72a0f6251aed97b21b94dfa0c35ccc42fb8d9728 (patch) | |
| tree | d43ac41a927a176bcbf0eddd33cf0e57ce8d158d /lib/progress.h | |
| parent | 029ae110349ebcb791e701e4787eb5ac1014f2c6 (diff) | |
| download | curl-72a0f6251aed97b21b94dfa0c35ccc42fb8d9728.tar.gz | |
limit-rate: kick in even before "limit" data has been received
... and make sure to avoid integer overflows with really large values.
Reported-by: 刘佩东
Fixes #2371
Closes #2373
Diffstat (limited to 'lib/progress.h')
| -rw-r--r-- | lib/progress.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/progress.h b/lib/progress.h index 9333ab25c..3c2231cb6 100644 --- a/lib/progress.h +++ b/lib/progress.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, 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 @@ -49,11 +49,11 @@ void Curl_pgrsSetUploadCounter(struct Curl_easy *data, curl_off_t size); int Curl_pgrsUpdate(struct connectdata *); void Curl_pgrsResetTransferSizes(struct Curl_easy *data); void Curl_pgrsTime(struct Curl_easy *data, timerid timer); -long Curl_pgrsLimitWaitTime(curl_off_t cursize, - curl_off_t startsize, - curl_off_t limit, - struct curltime start, - struct curltime now); +timediff_t Curl_pgrsLimitWaitTime(curl_off_t cursize, + curl_off_t startsize, + curl_off_t limit, + struct curltime start, + struct curltime now); /* Don't show progress for sizes smaller than: */ #define LEAST_SIZE_PROGRESS BUFSIZE |