mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 07:07:04 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: backend: properly handle redispatch 0

Browse Source 
According to the documentation, "option redispatch 0" is expected to
disable redispatch just like "no option redispatch", but due to the
fact that it keeps PR_O_REDISP set, it doesn't actually work. Let's
make sure value 0 is properly handled and drops PR_O_REDISP. This can
be backported to all versions since it seems it has been broken since
its introduction in 1.6 with commit 726ab7145c ("MEDIUM: backend: Allow
redispatch on retry intervals").

As a workaround, "no option redispatch" does work though.
This commit is contained in:
Willy Tarreau 2024-04-02 15:15:32 +02:00
parent 4c361a9d8a
commit e9b774f4b3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cfgparse-listen.c
View File

@ -2050,8 +2050,10 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
case KWM_STD: case KWM_STD:
curproxy->options |= PR_O_REDISP; curproxy->options |= PR_O_REDISP;
curproxy->redispatch_after = -1; curproxy->redispatch_after = -1;
if(*args[2]) { if (*args[2]) {
curproxy->redispatch_after = atol(args[2]); curproxy->redispatch_after = atol(args[2]);
if (!curproxy->redispatch_after)
curproxy->options &= ~PR_O_REDISP;
} }
break; break;
case KWM_NO: case KWM_NO: