Bug 3659: read_timeout problem with HTTPS

diff --git a/src/tunnel.cc b/src/tunnel.cc
index cc665e22ef00299412ee7212603473016c07c896..6495a211b4dc47d10f634fb55e86521dfde42ced 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -308,9 +308,14 @@ TunnelStateData::copy (size_t len, comm_err_t errcode, int xerrno, Connection &f
      */
     cbdataInternalLock(this);  /* ??? should be locked by the caller... */
 
-    /* Bump the server connection timeout on any activity */
-    if (!fd_closed(server.fd()))
-        commSetTimeout(server.fd(), Config.Timeout.read, tunnelTimeout, this);
+    /* Bump the source connection timeout on any activity */
+    if (!fd_closed(from.fd()))
+        commSetTimeout(from.fd(), Config.Timeout.read, tunnelTimeout, this);
+
+    /* Bump the dest connection read timeout on any activity */
+    /* see Bug 3659: tunnels can be weird, with very long one-way transfers */
+    if (!fd_closed(to.fd()))
+        commSetTimeout(to.fd(), Config.Timeout.read, tunnelTimeout, this);
 
     if (errcode)
         from.error (xerrno);