From e6cc70b01f04726bec55199ef2cfe9d29a5924b9 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 21 Aug 2012 18:18:24 +0200
Subject: httpd: sync with rawhide, update to 2.4.3

---
 httpd-2.4.2-restart.patch | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete 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
deleted file mode 100644
index b4f9942..0000000
--- a/httpd-2.4.2-restart.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-https://bugzilla.redhat.com/show_bug.cgi?id=814645
-
-http://svn.apache.org/viewvc?rev=1331847&view=rev
-
---- 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