Commit 726ae07b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 23ab4816
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1075,7 +1075,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
            failf(data, "Operation timed out after %ld milliseconds with %"
            failf(data, "Operation timed out after %ld milliseconds with %"
                  CURL_FORMAT_CURL_OFF_T " out of %"
                  CURL_FORMAT_CURL_OFF_T " out of %"
                  CURL_FORMAT_CURL_OFF_T " bytes received",
                  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);
                  k->bytecount, k->size);
          }
          }
          else {
          else {