From 14184dc422b158575b35881d4f46121aa1fb7681 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 20 Apr 2012 17:32:27 +0200
Subject: httpd-2.4.2-3: sync with rawhide

---
 httpd-2.4.2-restart.patch | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 httpd-2.4.2-restart.patch

(limited to 'httpd-2.4.2-restart.patch')

diff --git a/httpd-2.4.2-restart.patch b/httpd-2.4.2-restart.patch
new file mode 100644
index 0000000..07ff452
--- /dev/null
+++ b/httpd-2.4.2-restart.patch
@@ -0,0 +1,29 @@
+
+https://bugzilla.redhat.com/show_bug.cgi?id=814645
+
+--- httpd-2.4.2/server/main.c.restart
++++ httpd-2.4.2/server/main.c
+@@ -671,6 +671,11 @@ int main(int argc, const char * const ar
+         }
+     }
+ 
++    /* If our config failed, deal with that here. */
++    if (rv != OK) {
++        destroy_and_exit_process(process, 1);
++    }
++
+     signal_server = APR_RETRIEVE_OPTIONAL_FN(ap_signal_server);
+     if (signal_server) {
+         int exit_status;
+@@ -680,11 +685,6 @@ int main(int argc, const char * const ar
+         }
+     }
+ 
+-    /* If our config failed, deal with that here. */
+-    if (rv != OK) {
+-        destroy_and_exit_process(process, 1);
+-    }
+-
+     apr_pool_clear(plog);
+ 
+     if ( ap_run_open_logs(pconf, plog, ptemp, ap_server_conf) != OK) {
-- 
cgit