From: Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
Date: Mon, 26 Nov 2012 11:06:26 +0000 (-0700)
Subject: Bug 3659: read_timeout problem with HTTPS
X-Git-Tag: SQUID_3_1_22~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64fcbcee6d7618b9ff90101649761bcee2a58cb2;p=thirdparty%2Fsquid.git

Bug 3659: read_timeout problem with HTTPS
---

diff --git a/src/tunnel.cc b/src/tunnel.cc
index cc665e22ef..6495a211b4 100644
--- 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);