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 f5aeb5d139d04785f511555b85bf9a7fa6777b25..8c55b1f7a6542c2122bb3f0ececdd3d655983e98 100644 (file)
--- 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);