]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 3205: SSL-bump starts then hangs
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Sat, 7 May 2011 03:16:27 +0000 (21:16 -0600)
committerAmos Jeffries <squid3@treenet.co.nz>
Sat, 7 May 2011 03:16:27 +0000 (21:16 -0600)
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.

src/client_side.cc

index 6e98d722cf99322b6d99ac7d4bc9bd9d1b096ba8..7c842f28c12b93229257f3023e9a31edf37d124e 100644 (file)
@@ -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();