From: Juan <jdsq12@yahoo.es>
Date: Wed, 6 Jun 2012 00:28:11 +0000 (-0600)
Subject: Bug 2138: NTLM passthrough using accel cache_peer and ssl
X-Git-Tag: BumpSslServerFirst.take09~3^2~16
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=39322ebaf8c73c5f33690c54f5faa1456f744711;p=thirdparty%2Fsquid.git

Bug 2138: NTLM passthrough using accel cache_peer and ssl
---

diff --git a/src/forward.cc b/src/forward.cc
index e78081b5fa..605785026f 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -759,10 +759,12 @@ FwdState::connectDone(const Comm::ConnectionPointer &conn, comm_err_t status, in
         peerConnectSucceded(serverConnection()->getPeer());
 
 #if USE_SSL
-    if ((serverConnection()->getPeer() && serverConnection()->getPeer()->use_ssl) ||
-            (!serverConnection()->getPeer() && request->protocol == AnyP::PROTO_HTTPS)) {
-        initiateSSL();
-        return;
+    if (!request->flag.pinned) {
+        if ((serverConnection()->getPeer() && serverConnection()->getPeer()->use_ssl) ||
+                (!serverConnection()->getPeer() && request->protocol == AnyP::PROTO_HTTPS)) {
+            initiateSSL();
+            return;
+        }
     }
 #endif