From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 11 Sep 2018 08:06:22 +0000 (+0200)
Subject: MEDIUM: mworker: never block SIG{TERM,INT} during reload
X-Git-Tag: v1.9-dev2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=242aae96c7ce0e98bfbf9f436bbf2c1dbb88467e;p=thirdparty%2Fhaproxy.git

MEDIUM: mworker: never block SIG{TERM,INT} during reload

The master should be able to be killed even if the reload is not
finished.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 69d42da74f..e2fd627f8e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -491,8 +491,6 @@ static void mworker_block_signals()
 	sigaddset(&set, SIGUSR1);
 	sigaddset(&set, SIGUSR2);
 	sigaddset(&set, SIGHUP);
-	sigaddset(&set, SIGINT);
-	sigaddset(&set, SIGTERM);
 	sigaddset(&set, SIGCHLD);
 	ha_sigmask(SIG_SETMASK, &set, NULL);
 }
@@ -505,8 +503,6 @@ static void mworker_unblock_signals()
 	sigaddset(&set, SIGUSR1);
 	sigaddset(&set, SIGUSR2);
 	sigaddset(&set, SIGHUP);
-	sigaddset(&set, SIGINT);
-	sigaddset(&set, SIGTERM);
 	sigaddset(&set, SIGCHLD);
 	ha_sigmask(SIG_UNBLOCK, &set, NULL);
 }