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

BUG/MAJOR: mworker: fix infinite loop on master with no proxies.

Browse Source 
The master is re-exec with an empty proxies list if no master CLI is
configured.

This results in infinite loop since last patch:
3b68b602 ("BUG/MAJOR: log-forward: Fix log-forward proxies not fully initialized")

This patch avoid to loop again on log-forward proxies list if empty.

This patch should be backported until v2.3
This commit is contained in:
Emeric Brun 2022-08-22 10:25:11 +02:00 committed by William Lallemand
parent f1cfd9bc97
commit 8032a276ce
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cfgparse.c
View File

@ -3906,7 +3906,9 @@ out_uri_auth_compat:
*/ */
if (init_proxies_list == proxies_list) { if (init_proxies_list == proxies_list) {
init_proxies_list = cfg_log_forward; init_proxies_list = cfg_log_forward;
goto init_proxies_list_stage1; /* check if list is not null to avoid infinite loop */
if (init_proxies_list)
goto init_proxies_list_stage1;
} }
/***********************************************************/ /***********************************************************/
@ -4058,7 +4060,9 @@ init_proxies_list_stage2:
*/ */
if (init_proxies_list == proxies_list) { if (init_proxies_list == proxies_list) {
init_proxies_list = cfg_log_forward; init_proxies_list = cfg_log_forward;
goto init_proxies_list_stage2; /* check if list is not null to avoid infinite loop */
if (init_proxies_list)
goto init_proxies_list_stage2;
} }
if (diag_no_cluster_secret) if (diag_no_cluster_secret)