From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Sat, 7 May 2011 03:16:27 +0000 (-0600)
Subject: Bug 3205: SSL-bump starts then hangs
X-Git-Tag: SQUID_3_1_12_2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d092542cd56f695ead332b79f8331542dd4927ff;p=thirdparty%2Fsquid.git

Bug 3205: SSL-bump starts then hangs

The bug appeared after commit with revno:11364 which fixes Bug 3192.

In the case of SSL-bumped connections the ConnStateData::flags.readMore flag
must be reset (set to true) when we are switching to HTTPs,
because we have to read the new unencrypted HTTP request.
This patch reset this flag in ConnStateData::switchToHttps method.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 6e98d722cf..7c842f28c1 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3493,7 +3493,8 @@ ConnStateData::switchToHttps(const char *host)
     assert(areAllContextsForThisConnection());
     freeAllContexts();
     //currentobject->connIsFinished();
-
+    // We are going to read new request
+    flags.readMore = true;
     debugs(33, 5, HERE << "converting FD " << fd << " to SSL");
 
     return getSslContextStart();