From: Juan <jdsq12@yahoo.es>
Date: Fri, 1 Jul 2011 04:21:53 +0000 (-0600)
Subject: Bug 2138: NTLM passthrough using accel cache_peer and ssl
X-Git-Tag: SQUID_3_1_14~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36441bb364ebdba276302a3651d678d8a5843eaf;p=thirdparty%2Fsquid.git

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 45f623a723..5b1f9feb43 100644
--- 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