Bug 2138: NTLM passthrough using accel cache_peer and ssl

This is a temporary workaround for 3.1 series. A better fix for 3.2 and
later is known but needs verifiction.

diff --git a/src/forward.cc b/src/forward.cc
index 45f623a72339495f2989d5e0c89aa386f054f132..5b1f9feb43e409afd138aa46d8fadedbbebb2661 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -756,8 +756,10 @@ FwdState::connectDone(int aServerFD, const DnsLookupDetails &dns, comm_err_t sta
 
         if ((fs->_peer && fs->_peer->use_ssl) ||
                 (!fs->_peer && request->protocol == PROTO_HTTPS)) {
-            initiateSSL();
-            return;
+            if (fs->code != PINNED) {
+                initiateSSL();
+                return;
+            }
         }
 
 #endif