From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 23 Jun 2017 23:18:21 +0000 (+0200)
Subject: progress: fix "time spent", broke in adef394ac
X-Git-Tag: curl-7_55_0~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64ed44a815e4e;p=curl

progress: fix "time spent", broke in adef394ac
---

diff --git a/lib/progress.c b/lib/progress.c
index ccabe3c5d..dce756b7b 100644
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -361,18 +361,18 @@ int Curl_pgrsUpdate(struct connectdata *conn)
   now = Curl_tvnow(); /* what time is it */
 
   /* The time spent so far (from the start) */
-  data->progress.timespent = Curl_tvdiff_us(now, data->progress.start);
-  timespent = (curl_off_t)data->progress.timespent;
+  data->progress.timespent = Curl_tvdiff(now, data->progress.start);
+  timespent = (curl_off_t)data->progress.timespent/1000; /* integer seconds */
 
   /* The average download speed this far */
   data->progress.dlspeed = (curl_off_t)
     (data->progress.downloaded/
-     (data->progress.timespent>0?data->progress.timespent:1));
+     (timespent>0?timespent:1));
 
   /* The average upload speed this far */
   data->progress.ulspeed = (curl_off_t)
     (data->progress.uploaded/
-     (data->progress.timespent>0?data->progress.timespent:1));
+     (timespent>0?timespent:1));
 
   /* Calculations done at most once a second, unless end is reached */
   if(data->progress.lastshow != now.tv_sec) {