From: Willy Tarreau Date: Mon, 7 Jul 2025 14:53:53 +0000 (+0200) Subject: MEDIUM: resolvers: switch dns-accept-family to "auto" by default X-Git-Tag: v3.3-dev3~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54d36f3e6505a1380b058f43f9e7ba1697f4ef21;p=thirdparty%2Fhaproxy.git 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 509ffbda8..60f076b38 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -2436,7 +2436,8 @@ dns-accept-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 d52303381..cafae8e2b 100644 --- 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);