[svn] Undo the 2004-11-18 change to fd_read_body. Instead, always use the

"exact" flag.

diff --git a/src/ChangeLog b/src/ChangeLog
index 67059694594e2b865ce00de6ad00362751c76f21..2e996aa0a6995be0e09617ee7a7d35ab26843be9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-15  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * retr.c (fd_read_body): Undo the 2004-11-18 change.  Instead,
+       always be "exact".
+
 2005-03-17  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * ftp-basic.c (ftp_login): Don't free the string if ftp_response

diff --git a/src/retr.c b/src/retr.c
index 978fb7284036960cc0dc3dc2605e8b7d90644d0f..ad075f2f9df17a404e0b9d8fb8569cb1909b4aa6 100644 (file)
--- a/src/retr.c
+++ b/src/retr.c
@@ -214,7 +214,8 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
      data arrives slowly. */
   int progress_interactive = 0;
 
-  int exact = flags & rb_read_exactly;
+  /*int exact = flags & rb_read_exactly;*/
+  int exact = 1;
   wgint skip = 0;
 
   /* How much data we've read/written.  */
@@ -285,13 +286,6 @@ fd_read_body (int fd, FILE *out, wgint toread, wgint startpos,
        }
       ret = fd_read (fd, dlbuf, rdsize, tmout);
 
-      /* when retrieving from http-proxy wget sometimes does not trust the 
-       * file length reported by server.
-       * this check is to tell wget not to stubbornly try to read again and 
-       * again until another errno code was received. */
-      if ( ret == -1 && errno == ETIMEDOUT && sum_read == toread && toread > 0 )
-       break;
-
       if (ret == 0 || (ret < 0 && errno != ETIMEDOUT))
        break;                  /* read error */
       else if (ret < 0)