--------------------- PatchSet 11598 Date: 2007/08/31 13:42:20 Author: hno Branch: SQUID_2_6 Tag: (none) Log: MFC: Don't request authentication on transparently intercepted connections Merged changes: 2007/08/15 01:15:43 hno +2 -2 Don't request authentication on transparently intercepted connections Members: src/client_side.c:1.693.2.13->1.693.2.14 Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid/squid/src/client_side.c,v retrieving revision 1.693.2.13 retrieving revision 1.693.2.14 diff -u -r1.693.2.13 -r1.693.2.14 --- squid/src/client_side.c 15 Jul 2007 09:52:17 -0000 1.693.2.13 +++ squid/src/client_side.c 31 Aug 2007 13:42:20 -0000 1.693.2.14 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.693.2.13 2007/07/15 09:52:17 hno Exp $ + * $Id: client_side.c,v 1.693.2.14 2007/08/31 13:42:20 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -424,7 +424,7 @@ http->redirect_state = REDIRECT_PENDING; clientRedirectStart(http); } else { - int require_auth = (answer == ACCESS_REQ_PROXY_AUTH || aclIsProxyAuth(AclMatchedName)); + int require_auth = (answer == ACCESS_REQ_PROXY_AUTH || aclIsProxyAuth(AclMatchedName)) && !http->request->flags.transparent; debug(33, 5) ("Access Denied: %s\n", http->uri); debug(33, 5) ("AclMatchedName = %s\n", AclMatchedName ? AclMatchedName : "");