From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 28 Apr 2011 19:32:43 +0000 (+0300)
Subject: Bug 3205: SSL-bump is broken in trunk
X-Git-Tag: take07~16^2~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83d4cd15c12c31c41d0c37656edcc12beb3a1f77;p=thirdparty%2Fsquid.git

Bug 3205: SSL-bump is broken in trunk

The bug appeared after commit with revno:11364 which fixes the 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 ad48c40d4b..755ac29709 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3572,7 +3572,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();