From: Baptiste Assmann <bedis9@gmail.com>
Date: Tue, 14 Jul 2015 19:42:49 +0000 (+0200)
Subject: BUG/MINOR: dns: wrong time unit for some DNS default parameters
X-Git-Tag: v1.6-dev3~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c5490ab9ca4c0667eec25748fe6665018c5fae8;p=thirdparty%2Fhaproxy.git

BUG/MINOR: dns: wrong time unit for some DNS default parameters

Madison May reported that the timeout applied by the default
configuration is inproperly set up.
This patch fix this:
 - hold valid default to 10s
 - timeout retry default to 1s
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 4015804918..fb9d45b059 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2187,8 +2187,8 @@ int cfg_parse_resolvers(const char *file, int linenum, char **args, int kwm)
 		curr_resolvers->id = strdup(args[1]);
 		curr_resolvers->query_ids = EB_ROOT;
 		/* default hold period for valid is 10s */
-		curr_resolvers->hold.valid = 10;
-		curr_resolvers->timeout.retry = 1;
+		curr_resolvers->hold.valid = 10000;
+		curr_resolvers->timeout.retry = 1000;
 		curr_resolvers->resolve_retries = 3;
 		LIST_INIT(&curr_resolvers->nameserver_list);
 		LIST_INIT(&curr_resolvers->curr_resolution);