---------------------
PatchSet 5486 
Date: 2007/08/24 06:24:41
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Document new external_acl_type options
Set default behaviour modes for those options linked to configure option

Members: 
	src/cf.data.pre:1.68.2.29->1.68.2.30 
	src/main.cc:1.42.4.18->1.42.4.19 

Index: squid3/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cf.data.pre,v
retrieving revision 1.68.2.29
retrieving revision 1.68.2.30
diff -u -r1.68.2.29 -r1.68.2.30
--- squid3/src/cf.data.pre	22 Aug 2007 09:00:58 -0000	1.68.2.29
+++ squid3/src/cf.data.pre	24 Aug 2007 06:24:41 -0000	1.68.2.30
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.68.2.29 2007/08/22 09:00:58 amosjeffries Exp $
+# $Id: cf.data.pre,v 1.68.2.30 2007/08/24 06:24:41 amosjeffries Exp $
 #
 # SQUID Web Proxy Cache		http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -1837,6 +1837,11 @@
 			cached entry should be initiated without needing to
 			wait for a new reply. (default 0 for no grace period)
 	  protocol=2.5	Compatibility mode for Squid-2.5 external acl helpers
+	  ipv4 / ipv6	IP-mode used to communicate to this helper.
+			For compatability with older configurations and helpers
+			'ipv4' is teh default unless --with-localhost-ipv6 is used.
+			--with-localhost-ipv6 changes the default to 'ipv6'.
+			SPECIAL NOTE: these options override --with-localhost-ipv6
 
 	FORMAT specifications
 
Index: squid3/src/main.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/main.cc,v
retrieving revision 1.42.4.18
retrieving revision 1.42.4.19
diff -u -r1.42.4.18 -r1.42.4.19
--- squid3/src/main.cc	23 Aug 2007 04:27:07 -0000	1.42.4.18
+++ squid3/src/main.cc	24 Aug 2007 06:24:41 -0000	1.42.4.19
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.42.4.18 2007/08/23 04:27:07 amosjeffries Exp $
+ * $Id: main.cc,v 1.42.4.19 2007/08/24 06:24:41 amosjeffries Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -1124,10 +1124,16 @@
         umask(oldmask);
 
     default_localhost_addr.SetLocalhost();
-    // AYJ INET6: back-compatible: localhost defaults to IPv4 unless set otherwise.
-    //		that will eventually change, but not during transition period.
-    //		it is blocked by: absent ICMPv6, untested 'external_acl_type ipv*'
+#if !IPV6_SPECIAL_LOCALHOST
+    /* INET6: back-compatible: localhost defaults to IPv4 unless set otherwise.
+     *		that will eventually change, but not during transition period.
+     *	it is blocked by:
+     *		absent ICMPv6
+     *		untested helpers on many admins configs
+     *		untested squid helper components: ICMPv4, unlinkd, (others?)
+     */
     default_localhost_addr.SetIPv4();
+#endif
 
     squid_srandom(time(NULL));