From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Wed, 1 Feb 2012 05:06:08 +0000 (-0700)
Subject: Do not set request->flags.no_direct for bumped CONNECT requests
X-Git-Tag: BumpSslServerFirst.take04~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fb65ee4f5c24aaca35e9cabfa00f9103f0ac6f3;p=thirdparty%2Fsquid.git

Do not set request->flags.no_direct for bumped CONNECT requests
because it precludes them from reaching their [direct] destination
unless allow-direct is set on http_port.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index a15e60addf..e3efdd0eeb 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2608,7 +2608,9 @@ clientProcessRequest(ConnStateData *conn, HttpParser *hp, ClientSocketContext *c
     request->flags.accelerated = http->flags.accel;
     request->flags.sslBumped = conn->switchedToHttps();
     request->flags.ignore_cc = conn->port->ignore_cc;
-    request->flags.no_direct = request->flags.accelerated ? !conn->port->allow_direct : 0;
+    // TODO: decouple http->flags.accel from request->flags.sslBumped
+    request->flags.no_direct = (request->flags.accelerated && !request->flags.sslBumped) ?
+        !conn->port->allow_direct : 0;
 
     /** \par
      * If transparent or interception mode is working clone the transparent and interception flags