---------------------
PatchSet 11451 
Date: 2007/05/22 01:02:50
Author: hno
Branch: HEAD
Tag: (none) 
Log:
external_acl_type %URI tag for referencing the complete requested URI

Members: 
	src/cf.data.pre:1.396->1.397 
	src/external_acl.c:1.30->1.31 

Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- squid/src/cf.data.pre	21 May 2007 21:59:55 -0000	1.396
+++ squid/src/cf.data.pre	22 May 2007 01:02:50 -0000	1.397
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.396 2007/05/21 21:59:55 hno Exp $
+# $Id: cf.data.pre,v 1.397 2007/05/22 01:02:50 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -2176,6 +2176,7 @@
 	  %IDENT	Ident user name
 	  %SRC		Client IP
 	  %SRCPORT	Client source port
+	  %URI		Requested URI
 	  %DST		Requested host
 	  %PROTO	Requested protocol
 	  %PORT		Requested port
Index: squid/src/external_acl.c
===================================================================
RCS file: /cvsroot/squid/squid/src/external_acl.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- squid/src/external_acl.c	21 Jan 2007 12:53:59 -0000	1.30
+++ squid/src/external_acl.c	22 May 2007 01:02:50 -0000	1.31
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.c,v 1.30 2007/01/21 12:53:59 adrian Exp $
+ * $Id: external_acl.c,v 1.31 2007/05/22 01:02:50 hno Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -112,6 +112,7 @@
 	EXT_ACL_SRCPORT,
 	EXT_ACL_MYADDR,
 	EXT_ACL_MYPORT,
+	EXT_ACL_URI,
 	EXT_ACL_DST,
 	EXT_ACL_PROTO,
 	EXT_ACL_PORT,
@@ -287,6 +288,8 @@
 	    format->type = EXT_ACL_MYADDR;
 	else if (strcmp(token, "%MYPORT") == 0)
 	    format->type = EXT_ACL_MYPORT;
+	else if (strcmp(token, "%URI") == 0)
+	    format->type = EXT_ACL_URI;
 	else if (strcmp(token, "%DST") == 0)
 	    format->type = EXT_ACL_DST;
 	else if (strcmp(token, "%PROTO") == 0)
@@ -383,6 +386,7 @@
 		DUMP_EXT_ACL_TYPE(SRCPORT);
 		DUMP_EXT_ACL_TYPE(MYADDR);
 		DUMP_EXT_ACL_TYPE(MYPORT);
+		DUMP_EXT_ACL_TYPE(URI);
 		DUMP_EXT_ACL_TYPE(DST);
 		DUMP_EXT_ACL_TYPE(PROTO);
 		DUMP_EXT_ACL_TYPE(PORT);
@@ -652,6 +656,9 @@
 	    snprintf(buf, sizeof(buf), "%d", request->my_port);
 	    str = buf;
 	    break;
+	case EXT_ACL_URI:
+	    str = urlCanonical(request);
+	    break;
 	case EXT_ACL_DST:
 	    str = request->host;
 	    break;