From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 16 Nov 2018 15:57:22 +0000 (+0100)
Subject: MEDIUM: cli: worker socketpair is unstoppable
X-Git-Tag: v1.9-dev7~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a337229ac29ef7614bafdfc23e5825a4d452e909;p=thirdparty%2Fhaproxy.git

MEDIUM: cli: worker socketpair is unstoppable

In master-worker mode, the socketpair CLI listener of the worker is now
marked unstoppable, which allows to connect to the CLI of an old process
which is in a leaving state, allowing to debug it.
---

diff --git a/src/cli.c b/src/cli.c
index 85e344d301..720a9b4516 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -2336,7 +2336,7 @@ int mworker_cli_sockpair_new(struct mworker_proc *mworker_proc, int proc)
 		l->backlog = global.stats_fe->backlog;
 		l->accept = session_accept_fd;
 		l->default_target = global.stats_fe->default_target;
-		l->options |= LI_O_UNLIMITED;
+		l->options |= (LI_O_UNLIMITED | LI_O_NOSTOP);
 		/* it's a sockpair but we don't want to keep the fd in the master */
 		l->options &= ~LI_O_INHERITED;
 		l->nice = -64;  /* we want to boost priority for local stats */