]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 3205: SSL-bump is broken in trunk
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Thu, 28 Apr 2011 19:32:43 +0000 (22:32 +0300)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Thu, 28 Apr 2011 19:32:43 +0000 (22:32 +0300)
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.

src/client_side.cc

index ad48c40d4bfda45dacd905061a46eb814fee1e9e..755ac2970977bb76ba949dfe0c83bc8f08ee64c1 100644 (file)
@@ -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();