From 57540d6d7f74adb348fc38e4b17cb74edecd71da Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 16 Mar 2012 00:07:26 -0600 Subject: [PATCH] Bug 3439: correct external_acl_type documented default for ipv4/ipv6 option --- doc/release-notes/release-3.1.sgml | 7 +++---- src/cf.data.pre | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml index 445e2eaa1c..7b8bf2a20f 100644 --- a/doc/release-notes/release-3.1.sgml +++ b/doc/release-notes/release-3.1.sgml @@ -1108,13 +1108,12 @@ NOCOMMENT_START external_acl_type

New options 'ipv4' and 'ipv6' are added to set the IPv4/v6 protocol between Squid and its helpers. - Please be aware of some limits to these options. These options only affet the transport protocol used + Please be aware of some limits to these options. These options only affect the transport protocol used to send data to and from the helpers. Squid in IPv6-mode may still send %SRC addresses in IPv4 or IPv6 format, so all helpers will need to be checked and converted to cope with such information cleanly. - ipv4 / ipv6 IP-mode used to communicate to this helper. - For compatability with older configurations and helpers - the default is 'ipv4'. + ipv4 / ipv6 IP protocol used to communicate with this helper. + The default is to auto-detect IPv6 and use it when available.

New header input format specifiers. To seperate Request and Reply headers when both passed back. diff --git a/src/cf.data.pre b/src/cf.data.pre index ae9d7f53ee..724a9be1ea 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -455,9 +455,8 @@ DOC_START 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 - the default is currently 'ipv4'. + ipv4 / ipv6 IP protocol used to communicate with this helper. + The default is to auto-detect IPv6 and use it when available. FORMAT specifications -- 2.47.2