From 27f49457718da8d27d7456dc42f903f04ce66b62 Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Jun 2012 20:23:37 -0600 Subject: [PATCH] Bug 2138: NTLM passthrough using accel cache_peer and ssl --- src/forward.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 -- 2.47.2