Bug 2138: NTLM passthrough using accel cache_peer and ssl

diff --git a/src/forward.cc b/src/forward.cc
index e78081b5fa336248bfea0fa663357481d07c37cd..605785026fbf9c47e7e67399ec7c0a9a2b24756c 100644 (file)
--- 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