------------------------------------------------------------
revno: 12361
revision-id: squid3@treenet.co.nz-20121013060627-8vvllqdvkmbisr4p
parent: squid3@treenet.co.nz-20121013060514-fne82qji4y4ok895
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.3
timestamp: Sat 2012-10-13 00:06:27 -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-20121013060627-8vvllqdvkmbisr4p
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 1562913e2b14a4d75fe0766391dcd764c8d5b6d1
# timestamp: 2012-10-13 06:07:47 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121013060514-\
#   fne82qji4y4ok895
# 
# Begin patch
=== modified file 'src/http.cc'
--- src/http.cc	2012-10-03 07:34:10 +0000
+++ src/http.cc	2012-10-13 06:06:27 +0000
@@ -1393,8 +1393,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.connectionAuth != 0));
             } else {
                 fwd->pconnPush(serverConnection, request->peer_host ? request->peer_host : request->GetHost());