From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 7 May 2011 02:19:06 +0000 (+1200)
Subject: Only ssl-bump CONNECT requests if they are about to be tunneled.
X-Git-Tag: take07~16^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3128181456bd0a92ceaf4d6d8b0a1572c1ac0867;p=thirdparty%2Fsquid.git

Only ssl-bump CONNECT requests if they are about to be tunneled.

Currently all CONNECT requests are bumped, even if the redirectors have
determined a 3xx, 4xx or 5xx reply should happen.

Adapters and access controls use their own duplicated reply paths unaffected
by this bug at present.
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index f5aeb5d139..8c55b1f7a6 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1121,14 +1121,13 @@ ClientHttpRequest::processRequest()
 {
     debugs(85, 4, "clientProcessRequest: " << RequestMethodStr(request->method) << " '" << uri << "'");
 
+    if (request->method == METHOD_CONNECT && !redirect.status) {
 #if USE_SSL
-    if (request->method == METHOD_CONNECT && sslBumpNeeded()) {
-        sslBumpStart();
-        return;
-    }
+        if (sslBumpNeeded()) {
+            sslBumpStart();
+            return;
+        }
 #endif
-
-    if (request->method == METHOD_CONNECT && !redirect.status) {
         logType = LOG_TCP_MISS;
         getConn()->stopReading(); // tunnels read for themselves
         tunnelStart(this, &out.size, &al.http.code);