------------------------------------------------------------
revno: 11683
revision-id: squid3@treenet.co.nz-20121017003247-xhjarx67yzkezl6y
parent: squid3@treenet.co.nz-20121017002030-ggwk1tlogiuk159p
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3655
author: Wolfgang Breyha <wbreyha@gmx.net>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Tue 2012-10-16 18:32:47 -0600
message:
  Bug 3655: pinning failure breaks NTLM and Negotiate authentication
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121017003247-xhjarx67yzkezl6y
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# testament_sha1: 8b8758f7fb40be1ecb272882b52646ebe4802e97
# timestamp: 2012-10-17 00:44:21 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
#   /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121017002030-\
#   ggwk1tlogiuk159p
# 
# Begin patch
=== modified file 'src/http.cc'
--- src/http.cc	2012-08-29 14:38:29 +0000
+++ src/http.cc	2012-10-17 00:32:47 +0000
@@ -1385,8 +1385,8 @@
                 ispinned = true;
             }
 
-            if (request->pinnedConnection() && ispinned) {
-                request->pinnedConnection()->pinConnection(serverConnection, request, _peer,
+            if (ispinned && request->clientConnectionManager.valid()) {
+                request->clientConnectionManager->pinConnection(serverConnection, request, _peer,
                         (request->flags.connection_auth != 0));
             } else {
                 fwd->pconnPush(serverConnection, request->peer_host ? request->peer_host : request->GetHost());