From: William Lallemand <wlallemand@haproxy.org>
Date: Fri, 22 Apr 2022 14:49:53 +0000 (+0200)
Subject: MINOR: httpclient/mworker: disable in the master process
X-Git-Tag: v2.6-dev7~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6ceba3170d98feded336cc9ef86ea1a4bb048c4;p=thirdparty%2Fhaproxy.git

MINOR: httpclient/mworker: disable in the master process

Disable the httpclient in the master process.
---

diff --git a/src/http_client.c b/src/http_client.c
index 60d05e6cb8..0614ae7705 100644
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -989,6 +989,9 @@ static int httpclient_precheck()
 	int err_code = 0;
 	char *errmsg = NULL;
 
+	if (global.mode & MODE_MWORKER_WAIT)
+		return 0;
+
 	httpclient_proxy = alloc_new_proxy("<HTTPCLIENT>", PR_CAP_LISTEN|PR_CAP_INT, &errmsg);
 	if (!httpclient_proxy) {
 		err_code |= ERR_ALERT | ERR_FATAL;
@@ -1080,6 +1083,9 @@ static int httpclient_postcheck()
 	struct proxy *curproxy = httpclient_proxy;
 	char *errmsg = NULL;
 
+	if (global.mode & MODE_MWORKER_WAIT)
+		return 0;
+
 	/* copy logs from "global" log list */
 	list_for_each_entry(logsrv, &global.logsrvs, list) {
 		struct logsrv *node = malloc(sizeof(*node));