mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-16 15:11:01 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: Make 'redispatch' directive fatal

Browse Source 
It was deprecated with HAProxy 1.5. Time to remove it.
This commit is contained in:
Tim Duesterhus 2019-05-14 20:57:58 +02:00 committed by Willy Tarreau
parent 7b7c47f05c
commit dac168bc15
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
doc/configuration.txt
View File

@ -2449,8 +2449,6 @@ external-check path X - X X
persist rdp-cookie X - X X persist rdp-cookie X - X X
rate-limit sessions X X X - rate-limit sessions X X X -
redirect - X X X redirect - X X X
redisp (deprecated) X - X X
redispatch (deprecated) X - X X
reqadd (deprecated) - X X X reqadd (deprecated) - X X X
reqallow (deprecated) - X X X reqallow (deprecated) - X X X
reqdel (deprecated) - X X X reqdel (deprecated) - X X X
@ -7760,30 +7758,6 @@ redirect scheme <sch> [code <code>] <option> [{if | unless} <condition>]
See section 7 about ACL usage. See section 7 about ACL usage.
redisp (deprecated)
redispatch (deprecated)
Enable or disable session redistribution in case of connection failure
May be used in sections: defaults | frontend | listen | backend
yes | no | yes | yes
Arguments : none
In HTTP mode, if a server designated by a cookie is down, clients may
definitely stick to it because they cannot flush the cookie, so they will not
be able to access the service anymore.
Specifying "redispatch" will allow the proxy to break their persistence and
redistribute them to a working server.
It also allows to retry last connection to another server in case of multiple
connection failures. Of course, it requires having "retries" set to a nonzero
value.
This form is deprecated, do not use it in any new configuration, use the new
"option redispatch" instead.
See also : "option redispatch"
reqadd <string> [{if | unless} <cond>] (deprecated) reqadd <string> [{if | unless} <cond>] (deprecated)
Add a header at the end of the HTTP request Add a header at the end of the HTTP request
May be used in sections : defaults | frontend | listen | backend May be used in sections : defaults | frontend | listen | backend

2
include/types/global.h
View File

@ -251,7 +251,7 @@ extern int atexit_flag;
/* bit values to go with "warned" above */ /* bit values to go with "warned" above */
/* unassigned : 0x00000001 (previously: WARN_BLOCK_DEPRECATED) */ /* unassigned : 0x00000001 (previously: WARN_BLOCK_DEPRECATED) */
/* unassigned : 0x00000002 */ /* unassigned : 0x00000002 */
#define WARN_REDISPATCH_DEPRECATED 0x00000004 /* unassigned : 0x00000004 (previously: WARN_REDISPATCH_DEPRECATED) */
#define WARN_CLITO_DEPRECATED 0x00000008 #define WARN_CLITO_DEPRECATED 0x00000008
#define WARN_SRVTO_DEPRECATED 0x00000010 #define WARN_SRVTO_DEPRECATED 0x00000010
#define WARN_CONTO_DEPRECATED 0x00000020 #define WARN_CONTO_DEPRECATED 0x00000020

14
src/cfgparse-listen.c
View File

@ -2822,18 +2822,10 @@ stats_error_parsing:
goto out; goto out;
} }
else if (!strcmp(args[0], "redispatch") || !strcmp(args[0], "redisp")) { else if (!strcmp(args[0], "redispatch") || !strcmp(args[0], "redisp")) {
if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL)) ha_alert("parsing [%s:%d] : keyword '%s' directive is not supported anymore since HAProxy 2.1. Use 'option redispatch'.\n", file, linenum, args[0]);
err_code |= ERR_WARN;
if (!already_warned(WARN_REDISPATCH_DEPRECATED)) err_code |= ERR_ALERT | ERR_FATAL;
ha_warning("parsing [%s:%d]: keyword '%s' is deprecated in favor of 'option redispatch', and will not be supported by future versions.\n", goto out;
file, linenum, args[0]);
err_code |= ERR_WARN;
/* enable reconnections to dispatch */
curproxy->options |= PR_O_REDISP;
if (alertif_too_many_args_idx(1, 0, file, linenum, args, &err_code))
goto out;
} }
else if (!strcmp(args[0], "http-reuse")) { else if (!strcmp(args[0], "http-reuse")) {
if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL)) if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))