------------------------------------------------------------
revno: 11700
revision-id: squid3@treenet.co.nz-20121110043936-xukvbox38z87gh4j
parent: squid3@treenet.co.nz-20121110043832-baks2wqz1pej3zgc
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3659
author: Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Fri 2012-11-09 21:39:36 -0700
message:
  Bug 3659: read_timeout problem with HTTPS
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121110043936-xukvbox38z87gh4j
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 2a416db07be26b4c32dfd3d5c8ba7a8e2769eeb2
# timestamp: 2012-11-10 04:40:06 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121110043832-\
#   baks2wqz1pej3zgc
# 
# Begin patch
=== modified file 'src/tunnel.cc'
--- src/tunnel.cc	2012-07-28 05:38:50 +0000
+++ src/tunnel.cc	2012-11-10 04:39:36 +0000
@@ -318,6 +318,14 @@
         commSetConnTimeout(from.conn, Config.Timeout.read, timeoutCall);
     }
 
+    /* Bump the dest connection read timeout on any activity */
+    /* see Bug 3659: tunnels can be weird, with very long one-way transfers */
+    if (Comm::IsConnOpen(to.conn)) {
+        AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "tunnelTimeout",
+                                         CommTimeoutCbPtrFun(tunnelTimeout, this));
+        commSetConnTimeout(to.conn, Config.Timeout.read, timeoutCall);
+    }
+
     if (errcode)
         from.error (xerrno);
     else if (len == 0 || !Comm::IsConnOpen(to.conn)) {