From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 7 Jun 2017 11:29:46 +0000 (+0200)
Subject: file: make speedcheck use current time for checks
X-Git-Tag: curl-7_54_1~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68c6dcb2cb682bc7363cdf3d2e58da225cf4e72e;p=thirdparty%2Fcurl.git

file: make speedcheck use current time for checks

... as it would previously just get the "now" timestamp before the
transfer starts and then not update it again.

Closes #1550
---

diff --git a/lib/file.c b/lib/file.c
index 7bd4535a0f..c804d75e11 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -311,7 +311,6 @@ static CURLcode file_upload(struct connectdata *conn)
   size_t nread;
   size_t nwrite;
   curl_off_t bytecount = 0;
-  struct timeval now = Curl_tvnow();
   struct_stat file_stat;
   const char *buf2;
 
@@ -399,7 +398,7 @@ static CURLcode file_upload(struct connectdata *conn)
     if(Curl_pgrsUpdate(conn))
       result = CURLE_ABORTED_BY_CALLBACK;
     else
-      result = Curl_speedcheck(data, now);
+      result = Curl_speedcheck(data, Curl_tvnow());
   }
   if(!result && Curl_pgrsUpdate(conn))
     result = CURLE_ABORTED_BY_CALLBACK;
@@ -436,7 +435,6 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
   char *buf = data->state.buffer;
   curl_off_t bytecount = 0;
   int fd;
-  struct timeval now = Curl_tvnow();
   struct FILEPROTO *file;
 
   *done = TRUE; /* unconditionally */
@@ -585,7 +583,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
     if(Curl_pgrsUpdate(conn))
       result = CURLE_ABORTED_BY_CALLBACK;
     else
-      result = Curl_speedcheck(data, now);
+      result = Curl_speedcheck(data, Curl_tvnow());
   }
   if(Curl_pgrsUpdate(conn))
     result = CURLE_ABORTED_BY_CALLBACK;