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 56e935a27fff05b63d36d57611237172c22e0e28..f4c03211e5eebc623fc61c4308a9fb35d65ea16d 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1110,14 +1110,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);