From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 23 Mar 2016 22:03:08 +0000 (+0100)
Subject: multi: fix "Operation timed out after" timer
X-Git-Tag: curl-7_49_0~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=726ae07b07c4cfba2abc2083d2f4d28ad4a6316d;p=curl

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
---

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 {