From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 6 Jan 2012 20:41:21 +0000 (+0100)
Subject: Drop dns_v4_fallback directive as it have no effect with parallel DNS lookups
X-Git-Tag: BumpSslServerFirst.take05~12^2~81^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65c1b47152992dface8ebce9cf5c3497a32ee07;p=thirdparty%2Fsquid.git

Drop dns_v4_fallback directive as it have no effect with parallel DNS lookups

The change to perform A and AAAA lookups in parallel made dns_v4_fallback
no longer have any effect.

This directive should be reinstanciated in future to enable pure IPv6 usage.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index b15356fc3b..c539547eef 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -7238,27 +7238,6 @@ DOC_START
 	nameservers by setting this option to 'off'.
 DOC_END
 
-NAME: dns_v4_fallback
-TYPE: onoff
-DEFAULT: on
-LOC: Config.onoff.dns_require_A
-IFDEF: !USE_DNSHELPER
-DOC_START
-	Standard practice with DNS is to lookup either A or AAAA records
-	and use the results if it succeeds. Only looking up the other if
-	the first attempt fails or otherwise produces no results.
-
-	That policy however will cause squid to produce error pages for some
-	servers that advertise AAAA but are unreachable over IPv6.
-
-	If this is ON  squid will always lookup both AAAA and A, using both.
-	If this is OFF squid will lookup AAAA and only try A if none found.
-
-	WARNING: There are some possibly unwanted side-effects with this on:
-		*) Doubles the load placed by squid on the DNS network.
-		*) May negatively impact connection delay times.
-DOC_END
-
 NAME: dns_v4_first
 TYPE: onoff
 DEFAULT: off
diff --git a/src/structs.h b/src/structs.h
index 37382fe7f7..47a523e55e 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -445,7 +445,6 @@ struct SquidConfig {
         int emailErrData;
         int httpd_suppress_version_string;
         int global_internal_static;
-        int dns_require_A;
 
 #if FOLLOW_X_FORWARDED_FOR
         int acl_uses_indirect_client;