BUG/MINOR: server: Don't reset resolver options on a new default-server line
When a new "default-server" line is parsed, some resolver options are reset.
Thus previously defined default options cannot be inherited. There is no
reason to do so. First because other server options are inherited. And then
because not all resolver options are reset. It is not consistent.
This patch should fix issue #2559. It should be backported to all stable
versions.
(cherry picked from commit 0d7c1bc6ab694b0d7bcb66d6ff7158d12998de76)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
(cherry picked from commit 7600de7d19b07a8969ff4e59a74c15b1f23d2279)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
(cherry picked from commit bff1fefbf85673b071b74bb8efbea2f79c9de600)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
(cherry picked from commit f158e83627db19d3cad3cb1ea2f49f1b54b97e26)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
diff --git a/src/server.c b/src/server.c
index 50f1163..0717d84 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2694,8 +2694,6 @@
else {
*srv = newsrv = &curproxy->defsrv;
*cur_arg = 1;
- newsrv->resolv_opts.family_prio = AF_INET6;
- newsrv->resolv_opts.accept_duplicate_ip = 0;
}
free(fqdn);