---------------------
PatchSet 6434 
Date: 2005/02/16 01:03:34
Author: hno
Branch: external_acl_fuzzy
Tag: (none) 
Log:
Imported some missing pieces

Members: 
	configure.in:1.80.2.1->1.80.2.2 
	src/cf.data.pre:1.91.2.1->1.91.2.2 
	src/client_side.c:1.83.2.1->1.83.2.2 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.80.2.1
retrieving revision 1.80.2.2
diff -u -r1.80.2.1 -r1.80.2.2
--- squid/configure.in	16 Feb 2005 00:53:29 -0000	1.80.2.1
+++ squid/configure.in	16 Feb 2005 01:03:34 -0000	1.80.2.2
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.80.2.1 2005/02/16 00:53:29 hno Exp $
+dnl  $Id: configure.in,v 1.80.2.2 2005/02/16 01:03:34 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.5.STABLE8-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.80.2.1 $)dnl
+AC_REVISION($Revision: 1.80.2.2 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2380,4 +2380,5 @@
 	helpers/external_acl/unix_group/Makefile \
 	helpers/external_acl/wbinfo_group/Makefile \
 	helpers/external_acl/winbind_group/Makefile \
+	helpers/external_acl/ident/Makefile \
 ])
Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.91.2.1
retrieving revision 1.91.2.2
diff -u -r1.91.2.1 -r1.91.2.2
--- squid/src/cf.data.pre	16 Feb 2005 00:53:44 -0000	1.91.2.1
+++ squid/src/cf.data.pre	16 Feb 2005 01:03:38 -0000	1.91.2.2
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.91.2.1 2005/02/16 00:53:44 hno Exp $
+# $Id: cf.data.pre,v 1.91.2.2 2005/02/16 01:03:38 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1550,6 +1550,9 @@
 			to service external acl lookups of this type.
 			Note: see compatibility note below
 	  cache=n	result cache size, 0 is unbounded (default)
+	  grace=	Percentage remaining of TTL where a refresh of a
+			cached entry should be initiated without needing to
+			wait for a new reply. (default 0 for no grace period)
 	  protocol=3.0	Use URL-escaped strings instead of quoting
 
 	FORMAT specifications
@@ -1567,6 +1570,10 @@
 	  		HTTP request header list member using ; as
 	  		list separator. ; can be any non-alphanumeric
 			character.
+	  %|		Marks a cache level. Formats on the left have a higher
+			priority than formats on the right and the helper can
+			indicate that the formats on the right is not relevant
+			for the reply. Can be specified multiple times.
 
 	In addition, any string specified in the referencing acl will
 	also be included in the helper request line, after the specified
@@ -1585,6 +1592,8 @@
 
 	  user=		The users name (login)
 	  error=	Error description (only defined for ERR results)
+	  level=	Cache level (optional). If not given then the
+			result is cached based on the whole query.
 
 	Keyword values need to be enclosed in quotes if they may contain
 	whitespace, or the whitespace escaped using \. Any quotes or \
Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.83.2.1
retrieving revision 1.83.2.2
diff -u -r1.83.2.1 -r1.83.2.2
--- squid/src/client_side.c	16 Feb 2005 00:53:44 -0000	1.83.2.1
+++ squid/src/client_side.c	16 Feb 2005 01:03:57 -0000	1.83.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.83.2.1 2005/02/16 00:53:44 hno Exp $
+ * $Id: client_side.c,v 1.83.2.2 2005/02/16 01:03:57 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -355,6 +355,7 @@
 	new_request->http_ver = old_request->http_ver;
 	httpHeaderAppend(&new_request->header, &old_request->header);
 	new_request->client_addr = old_request->client_addr;
+	new_request->client_port = old_request->client_port;
 	new_request->my_addr = old_request->my_addr;
 	new_request->my_port = old_request->my_port;
 	new_request->flags.redirected = 1;
@@ -3131,6 +3132,7 @@
 	    safe_free(http->log_uri);
 	    http->log_uri = xstrdup(urlCanonicalClean(request));
 	    request->client_addr = conn->peer.sin_addr;
+	    request->client_port = ntohs(conn->peer.sin_port);
 	    request->my_addr = conn->me.sin_addr;
 	    request->my_port = ntohs(conn->me.sin_port);
 	    request->http_ver = http->http_ver;