mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 12:41:00 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: config: propagate frontend to backend process binding again.

Browse Source 
This basically reverts 3507d5d ("MEDIUM: proxy: only adjust the backend's
bind-process when already set"). It was needed during the transition to
the new process binding method but is causing trouble now because frontend
to backend binding is not properly propagated.

This fix should be backported to 1.5.
This commit is contained in:
Willy Tarreau 2014-09-16 11:31:31 +02:00
parent ce730de867
commit 8a3478ed31
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cfgparse.c
View File

@ -6260,9 +6260,8 @@ int check_config_validity()
/* we force the backend to be present on at least all of
* the frontend's processes.
*/
if (target->bind_proc)
target->bind_proc = curproxy->bind_proc ?
(target->bind_proc | curproxy->bind_proc) : 0;
target->bind_proc = curproxy->bind_proc ?
(target->bind_proc | curproxy->bind_proc) : 0;
/* Emit a warning if this proxy also has some servers */
if (curproxy->srv) {
@ -6298,9 +6297,8 @@ int check_config_validity()
/* we force the backend to be present on at least all of
* the frontend's processes.
*/
if (target->bind_proc)
target->bind_proc = curproxy->bind_proc ?
(target->bind_proc | curproxy->bind_proc) : 0;
target->bind_proc = curproxy->bind_proc ?
(target->bind_proc | curproxy->bind_proc) : 0;
}
}
}
@ -6352,9 +6350,8 @@ int check_config_validity()
/* we force the backend to be present on at least all of
* the frontend's processes.
*/
if (target->bind_proc)
target->bind_proc = curproxy->bind_proc ?
(target->bind_proc | curproxy->bind_proc) : 0;
target->bind_proc = curproxy->bind_proc ?
(target->bind_proc | curproxy->bind_proc) : 0;
}
}