--------------------- PatchSet 1728 Date: 2001/03/13 12:10:29 Author: rbcollins Branch: auth_rewrite Tag: (none) Log: bugfix: persistent connections with NTLM were failing on the second request with 407 Members: src/acl.c:1.1.1.3.12.26.2.48->1.1.1.3.12.26.2.49 Index: squid/src/acl.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/acl.c,v retrieving revision 1.1.1.3.12.26.2.48 retrieving revision 1.1.1.3.12.26.2.49 diff -u -r1.1.1.3.12.26.2.48 -r1.1.1.3.12.26.2.49 --- squid/src/acl.c 10 Mar 2001 00:44:17 -0000 1.1.1.3.12.26.2.48 +++ squid/src/acl.c 13 Mar 2001 12:10:29 -0000 1.1.1.3.12.26.2.49 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.1.1.3.12.26.2.48 2001/03/10 00:44:17 hno Exp $ + * $Id: acl.c,v 1.1.1.3.12.26.2.49 2001/03/13 12:10:29 rbcollins Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -1213,7 +1213,7 @@ * so we test for an authenticated connection when we recieve no authentication * header. */ - if (((proxy_auth == NULL) && (!authenticateUserAuthenticated(auth_user_request))) + if (((proxy_auth == NULL) && (!authenticateUserAuthenticated(auth_user_request ? auth_user_request : checklist->conn->auth_user_request))) || (checklist->conn->auth_type == AUTH_BROKEN)) { /* no header or authentication failed/got corrupted - restart */ checklist->conn->auth_type = AUTH_UNKNOWN;