From: Paul Townsend <aab@purdue.edu>
Date: Wed, 27 Jan 2010 18:08:26 +0000 (-0800)
Subject: Time-measurement fix
X-Git-Tag: v1.13~198
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=068991e8a06bd7f12eb4688110edee8fac7b708c

Time-measurement fix
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 76ad7e40..be1eea4b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Paul Townsend  <aab@purdue.edu>  (tiny change)
+
+	* retr.c (fd_read_body): Be sure to measure timer when time has
+	elapsed, too, not just when we've made progress.
+
 2010-01-13  Micah Cowan  <micah@cowan.name>
 
 	* openssl.c: Fixed some mixed declarations-and-code.
diff --git a/src/retr.c b/src/retr.c
index edc48290..c9cec0fc 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -301,7 +301,7 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
       else if (ret <= 0)
         break;                  /* EOF or read error */
 
-      if (progress || opt.limit_rate)
+      if (progress || opt.limit_rate || elapsed)
         {
           ptimer_measure (timer);
           if (ret > 0)