From: Source Maintenance Date: Wed, 3 May 2017 18:12:07 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: M-staged-PR71~186 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91d7e7c47ef3fb4f9102adee53dd628fb8cd6b32;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 0f1bf1973d..27a7996adb 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -1427,7 +1427,7 @@ ClientRequestContext::sslBumpAccessCheck() if (bumpMode != Ssl::bumpEnd) { debugs(85, 5, HERE << "SslBump already decided (" << bumpMode << "), " << "ignoring ssl_bump for " << http->getConn()); - + // We need the following "if" for transparently bumped TLS connection, // because in this case we are running ssl_bump access list before // the doCallouts runs. It can be removed after the bug #4340 fixed. @@ -1437,7 +1437,7 @@ ClientRequestContext::sslBumpAccessCheck() // or because of the client-first bumping mode // - When the bumping is already started if (!http->getConn()->switchedToHttps() && - !http->getConn()->serverBump()) + !http->getConn()->serverBump()) http->sslBumpNeed(bumpMode); // for processRequest() to bump if needed and not already bumped http->al->ssl.bumpMode = bumpMode; // inherited from bumped connection return false;