|
 |
94399e0 |
From 20656c3b77cc548b59fea3bde5e2b7705d71c427 Mon Sep 17 00:00:00 2001
|
|
|
94399e0 |
From: =?UTF-8?q?Jan=20Kalu=C5=BEa?= <jkaluza@apache.org>
|
|
|
94399e0 |
Date: Mon, 18 Aug 2014 07:43:43 +0000
|
|
|
94399e0 |
Subject: [PATCH] prefork: Ignore SIGINT in child. This fixes race-condition in
|
|
|
94399e0 |
signals handling when httpd is runnning on foreground and user hits ctrl+c.
|
|
|
94399e0 |
In this case, SIGINT is sent to all children followed by SIGTERM from the
|
|
|
94399e0 |
main process, which interrupts the SIGINT handler and leads to inconsistency
|
|
|
94399e0 |
(process freezes or crashes).
|
|
|
94399e0 |
|
|
|
94399e0 |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1618555 13f79535-47bb-0310-9956-ffa450edef68
|
|
|
94399e0 |
---
|
|
|
94399e0 |
server/mpm/prefork/prefork.c | 10 ++++++++++
|
|
|
94399e0 |
1 file changed, 10 insertions(+)
|
|
|
94399e0 |
|
|
|
94399e0 |
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
|
|
|
94399e0 |
index 8790ec0..d6c038b 100644
|
|
|
94399e0 |
--- a/server/mpm/prefork/prefork.c
|
|
|
94399e0 |
+++ b/server/mpm/prefork/prefork.c
|
|
|
94399e0 |
@@ -222,6 +222,9 @@ static void clean_child_exit(int code)
|
|
|
94399e0 |
{
|
|
|
94399e0 |
mpm_state = AP_MPMQ_STOPPING;
|
|
|
94399e0 |
|
|
|
94399e0 |
+ apr_signal(SIGHUP, SIG_IGN);
|
|
|
94399e0 |
+ apr_signal(SIGTERM, SIG_IGN);
|
|
|
94399e0 |
+
|
|
|
94399e0 |
if (pchild) {
|
|
|
94399e0 |
apr_pool_destroy(pchild);
|
|
|
94399e0 |
}
|
|
|
94399e0 |
@@ -817,6 +820,13 @@ static int make_child(server_rec *s, int slot)
|
|
|
94399e0 |
*/
|
|
|
94399e0 |
apr_signal(SIGHUP, just_die);
|
|
|
94399e0 |
apr_signal(SIGTERM, just_die);
|
|
|
94399e0 |
+ /* Ignore SIGINT in child. This fixes race-condition in signals
|
|
|
94399e0 |
+ * handling when httpd is runnning on foreground and user hits ctrl+c.
|
|
|
94399e0 |
+ * In this case, SIGINT is sent to all children followed by SIGTERM
|
|
|
94399e0 |
+ * from the main process, which interrupts the SIGINT handler and
|
|
|
94399e0 |
+ * leads to inconsistency.
|
|
|
94399e0 |
+ */
|
|
|
94399e0 |
+ apr_signal(SIGINT, SIG_IGN);
|
|
|
94399e0 |
/* The child process just closes listeners on AP_SIG_GRACEFUL.
|
|
|
94399e0 |
* The pod is used for signalling the graceful restart.
|
|
|
94399e0 |
*/
|
|
|
94399e0 |
--
|
|
|
94399e0 |
2.0.4
|
|
|
94399e0 |
|