Bug 4691: balance_on_multiple_ip config option docs (#273)

Add missing balance_on_multiple_ip removal documentation
after the active code was removed by 3.2 TCP connection
server selection changes.

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 1359e5bb1b345f823410cd6fd313ad91c204a5fe..d09eb1453e738dfb4a6f9b0ec60fc110f16f3759 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -744,6 +744,10 @@ This section gives a thorough account of those changes in three categories:
 <sect1>Removed tags<label id="removedtags">
 <p>
 <descrip>
+       <tag>balance_on_multiple_ip</tag>
+       <p>Obsolete. The behaviour controlled by this directive is no longer possible
+          with DNS parallel lookup and connection features (aka 'Happy Eyeballs').
+
        <tag>chunked_request_body_max_size</tag>
        <p>Obsolete. Squid is now HTTP/1.1 with support for streaming chunked encoded requests.
 

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index d99dd629418751412c48b5c1fa931465119ea2a3..fad98154d2fbf37aecb7e43d5cae8003192161ea 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -315,7 +315,6 @@ public:
         int surrogate_is_remote;
         int request_entities;
         int detect_broken_server_pconns;
-        int balance_on_multiple_ip;
         int relaxed_header_parser;
         int check_hostnames;
         int allow_underscore;

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 6255d302dc8232f241818c1592542a0fa1e4d24a..070b7f068b8107df707133f5b3ace63a48713580 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -252,6 +252,12 @@ DOC_START
 DOC_END
 
 # Options Removed in 3.2
+NAME: balance_on_multiple_ip
+TYPE: obsolete
+DOC_START
+       Remove this line. Squid performs a 'Happy Eyeballs' algorithm, this multiple-IP algorithm is not longer relevant.
+DOC_END
+
 NAME: chunked_request_body_max_size
 TYPE: obsolete
 DOC_START
@@ -10188,22 +10194,6 @@ DOC_START
        get an error saying that Squid can not open the port.
 DOC_END
 
-NAME: balance_on_multiple_ip
-TYPE: onoff
-LOC: Config.onoff.balance_on_multiple_ip
-DEFAULT: off
-DOC_START
-       Modern IP resolvers in squid sort lookup results by preferred access.
-       By default squid will use these IP in order and only rotates to
-       the next listed when the most preffered fails.
-
-       Some load balancing servers based on round robin DNS have been
-       found not to preserve user session state across requests
-       to different IP addresses.
-
-       Enabling this directive Squid rotates IP's per request.
-DOC_END
-
 NAME: pipeline_prefetch
 TYPE: pipelinePrefetch
 LOC: Config.pipeline_max_prefetch