Bug #1501: ftp downloads may last up to read_timeout

by Gonzalo Arana

diff --git a/src/ftp.cc b/src/ftp.cc
index e3461d2e729a278343f8010aa41f74ed2839d41a..af2f7a0c695154f3c6425e2c06f139b3443a116e 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.396 2006/05/08 23:38:33 robertc Exp $
+ * $Id: ftp.cc,v 1.397 2006/05/16 16:05:08 hno Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1280,7 +1280,7 @@ FtpStateData::dataRead(int fd, char *buf, size_t len, comm_err_t errflag, int xe
         debug(50, ignoreErrno(xerrno) ? 3 : 1) ("ftpDataRead: read error: %s\n", xstrerr(xerrno));
 
         if (ignoreErrno(xerrno)) {
-            /* XXX what about Config.Timeout.read? */
+            commSetTimeout(fd, Config.Timeout.read, ftpTimeout, this);
             maybeReadData();
         } else {
             if (!flags.http_header_sent && !fwd->ftpPasvFailed() && flags.pasv_supported) {
@@ -1327,7 +1327,7 @@ FtpStateData::processReplyBody()
 
     storeBufferFlush(entry);
 
-    /* XXX what about Config.Timeout.read? */
+    commSetTimeout(data.fd, Config.Timeout.read, ftpTimeout, this);
     maybeReadData();
 }