Kolab Groupware OBS

httpd.spec Changed

httpd-2.4.10-sigint.patch Changed

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

httpd-2.4.25.tar.bz2 -> httpd-2.4.27.tar.bz2 Changed

Changes of Revision 6