diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-03-23 23:03:08 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-03-23 23:03:08 +0100 |
| commit | 726ae07b07c4cfba2abc2083d2f4d28ad4a6316d (patch) | |
| tree | 306dd3b2a839c7a616a106ec132818326560d258 /lib/multi.c | |
| parent | 23ab4816443e2b9fb5e2098e2002e920594421d6 (diff) | |
| download | gnurl-726ae07b07c4cfba2abc2083d2f4d28ad4a6316d.tar.gz gnurl-726ae07b07c4cfba2abc2083d2f4d28ad4a6316d.tar.bz2 gnurl-726ae07b07c4cfba2abc2083d2f4d28ad4a6316d.zip | |
multi: fix "Operation timed out after" timer
Use the local, reasonably updated, 'now' value when creating the message
string to output for the timeout condition.
Fixes #619
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c index a147963f8..fc4f343b9 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1075,7 +1075,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, failf(data, "Operation timed out after %ld milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %" CURL_FORMAT_CURL_OFF_T " bytes received", - Curl_tvdiff(k->now, data->progress.t_startsingle), + Curl_tvdiff(now, data->progress.t_startsingle), k->bytecount, k->size); } else { |