MEDIUM: resolvers: switch dns-accept-family to "auto" by default

As notified in the 3.2 announce [1], dns-accept-family needed to switch
to "auto" by default in 3.3. This is now done.

[1] https://www.mail-archive.com/haproxy@formilux.org/msg45917.html

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 509ffbda8bf9c20e34f4b68e1638e3a7467dfe7d..60f076b382c65609ead4b0ebf7a553f4a1faa811 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2436,7 +2436,8 @@ dns-accept-family <family>[,...]
 
   When a single family is used, no request will be sent to resolvers for the
   other family, and any response for the othe family will be ignored. The
-  default value is "ipv4,ipv6", which effectively enables both families.
+  default value since 3.3 is "auto", which effectively enables both families
+  only once IPv6 has been proven to be routable, otherwise sticks to IPv4.
   See also: "resolve-prefer", "do-resolve"
 
 expose-deprecated-directives

diff --git a/src/resolvers.c b/src/resolvers.c
index d52303381189c8c3d3ac2f1d14087afb89ff0e3c..cafae8e2b558cf0aff7e83e7e891e2aa5234bd06 100644 (file)
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -70,7 +70,7 @@ DECLARE_POOL(resolv_requester_pool,  "resolv_requester",  sizeof(struct resolv_r
 
 static unsigned int resolution_uuid = 1;
 unsigned int resolv_failed_resolutions = 0;
-uint resolv_accept_families = RSLV_ACCEPT_IPV4 | RSLV_ACCEPT_IPV6;
+uint resolv_accept_families = RSLV_AUTO_FAMILY;
 
 struct task *process_resolvers(struct task *t, void *context, unsigned int state);
 static void resolv_free_resolution(struct resolv_resolution *resolution);