Time-measurement fix

diff --git a/src/ChangeLog b/src/ChangeLog
index 76ad7e40e76a20a818477ea1bdf3594ce23e8049..be1eea4bd76be53c40111fc88b5679e392272dab 100644 (file)
--- 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 edc482906312085e8b01e10d42f010627080b6fc..c9cec0fc60001520b14d8c62c604b2e449e29dfa 100644 (file)
--- 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)