Remove last remains of dead options

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index f371e3eb5c1e73bc1a9f4a95728102f52d1a9747..bbabbc4757f7012fa2116c2d8f5cc72c6b56e36c 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -893,9 +893,7 @@ NOCOMMENT_START
         <verb>
           ipv4 / ipv6   IP-mode used to communicate to this helper.
                         For compatability with older configurations and helpers
-                        'ipv4' is the default unless --with-localhost-ipv6 is used.
-                        --with-localhost-ipv6 changes the default to 'ipv6'.
-                        SPECIAL NOTE: explicit use of these options override --with-localhost-ipv6
+                        the default is 'ipv4'.
         </verb>
        <p>New header input format specifiers. To seperate Request and Reply headers when both passed back.
        <verb>
@@ -1104,12 +1102,6 @@ This section gives an account of those changes in three categories:
        <p>If it produces ongoing serious problems the external helper may be needed
           but please report the bugs anyway.
 
-       <tag>--with-localhost-ipv6</tag>
-       <p>Build support for squid to map all 127.0.0.1 traffic onto ::1.
-           The default is to build with 127.0.0.1 and ::1 being considered seperate IP.
-           see the IPv6 details above for a better description.
-       <p>WARNING: This is an RFC violation. Use is discouraged.
-
        <tag>--with-logdir=PATH</tag>
        <p>Allow build-time configuration of Default location for squid logs.
 

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 431d466a289ff43a9d6d296f4062c44f7f193096..cb69b9534f14d01f7a40b8a815564683e63cd30c 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -399,9 +399,7 @@ DOC_START
          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 the default unless --with-localhost-ipv6 is used.
-                       --with-localhost-ipv6 changes the default to 'ipv6'.
-                       SPECIAL NOTE: these options override --with-localhost-ipv6
+                       the default is 'ipv4'.
 
        FORMAT specifications
 

diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts
index 70ed43c12cb664d51d3336f63fcd8831745fc371..ed7190e4cba1cf79fa112d0d1c59f5730f444914 100644 (file)
--- a/test-suite/buildtests/layer-01-minimal.opts
+++ b/test-suite/buildtests/layer-01-minimal.opts
@@ -87,8 +87,6 @@ OPTS=" \
        --without-large-files \
        --without-valgrind-debug \
        --without-ipv6-split-stack \
-       --without-ipv4-mapped \
-       --without-localhost-ipv6 \
        --without-dns-cname \
        --without-po2html \
        "

diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts
index 559ad6a2ec8a3a1cd815527cf2f8c7cb5c23ceb7..a0d6cd012c918c7efe6dbef656afa51a047b8b99 100644 (file)
--- a/test-suite/buildtests/layer-02-maximus.opts
+++ b/test-suite/buildtests/layer-02-maximus.opts
@@ -32,7 +32,6 @@
 #   --enable-kqueue \
 #   --enable-esi \
 #   --enable-win32-service \
-#   --with-localhost-ipv6 \
 #
 #
 OPTS=" \