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 a147963f8dae2034bbd82916252a61010572b415..fc4f343b9ac08131c67de20a0613bb1537c947bd 100644 (file)
--- 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 {