mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-05 09:21:42 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: mworker/httpclient: initialization skipped by accident in mworker mode

Browse Source 
Since commit fe75c1e12da061 ("MEDIUM: startup: remove
MODE_MWORKER_WAIT") the MODE_MWORKER_WAIT constant disappearded. The
initialization of the httpclient proxy was conditionned by this
constant.

The proxy must be created in mworker mode, but only in the worker not in
the master. It was currently completely disabled in both the master and
the worker provoking a NULL dereference upon httpclient usage.

No backport needed.
This commit is contained in:
William Lallemand 2024-10-17 12:09:05 +02:00
parent e7b7072943
commit fdbff3a020
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http_client.c
View File

@ -1208,7 +1208,8 @@ struct proxy *httpclient_create_proxy(const char *id)
struct server *srv_ssl = NULL;
#endif
if (global.mode & MODE_MWORKER)
/* the httpclient is not usable in the master process */
if (master)
return ERR_NONE;
px = alloc_new_proxy(id, PR_CAP_LISTEN|PR_CAP_INT|PR_CAP_HTTPCLIENT, &errmsg);
@ -1345,8 +1346,11 @@ err:
*/
static int httpclient_precheck()
{
/* initialize the default httpclient_proxy which is used for the CLI and the lua */
/* the httpclient is not usable in the master process */
if (master)
return ERR_NONE;
/* initialize the default httpclient_proxy which is used for the CLI and the lua */
httpclient_proxy = httpclient_create_proxy("<HTTPCLIENT>");
if (!httpclient_proxy)
return ERR_RETRYABLE;
@ -1365,7 +1369,8 @@ static int httpclient_postcheck_proxy(struct proxy *curproxy)
struct server *srv_ssl = NULL;
#endif
if (global.mode & MODE_MWORKER)
/* the httpclient is not usable in the master process */
if (master)
return ERR_NONE;
if (!(curproxy->cap & PR_CAP_HTTPCLIENT))