konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: Make 'resolution_pool_size' directive fatal

Browse Source 
This directive never appeared in a stable release and instead was
introduced and deprecated within 1.8-dev. While it technically could
be outright removed we detect it and error out for good measure.
This commit is contained in:
Tim Duesterhus 2019-05-14 20:57:56 +02:00 committed by Willy Tarreau
parent 10c6c16cde
commit 3506dae342
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/configuration.txt
View File

@ -12759,11 +12759,6 @@ hold <status> <period>
Default value is 10s for "valid", 0s for "obsolete" and 30s for others.
resolution_pool_size <nb> (deprecated)
Defines the number of resolutions available in the pool for this resolvers.
If not defines, it defaults to 64. If your configuration requires more than
<nb>, then HAProxy will return an error when parsing the configuration.
resolve_retries <nb>
Defines the number <nb> of queries to send to resolve a server name before
giving up.

4
src/cfgparse.c
View File

@ -1250,9 +1250,9 @@ resolv_out:
curr_resolvers->accepted_payload_size = i;
}
else if (strcmp(args[0], "resolution_pool_size") == 0) {
ha_warning("parsing [%s:%d] : '%s' directive is now deprecated and ignored.\n",
ha_alert("parsing [%s:%d] : '%s' directive is not supported anymore (it never appeared in a stable release).\n",
file, linenum, args[0]);
err_code |= ERR_WARN;
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
else if (strcmp(args[0], "resolve_retries") == 0) {