Merge 1328345, add CHANGES entry:

* server/main.c (main): Bail out *before* signalling the server
  if the config is bad. (as per the claim in the docs!)

Submitted by: jorton
Reviewed by: jorton, jim, sf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1331847 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4f25bb67ab66361da3816029f34edb9d761b485f..d9365846e2e1d60bd8cea229a6acea60355dfd52 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@
 
 Changes with Apache 2.4.3
 
+  *) core: Prevent "httpd -k restart" from killing server in presence of
+     config error. [Joe Orton]
+
   *) mod_proxy_fcgi: If there is an error reading the headers from the
      backend, send an error to the client. PR 52879. [Stefan Fritsch]
 

diff --git a/STATUS b/STATUS
index cdd618b84b5b22003f92b82d81b56a0ae0ed7efc..28145278b50dc73ada2c6fde4072a4449680479d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,11 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4 patch: Trunk patch works
     +1: rbowen, jim, sf
 
-  * core: Prevent "httpd -k restart" from killing server in presence of config error.
-    trunk patch: http://svn.apache.org/viewvc?rev=1328345&view=rev
-    2.4 patch: trunk patch works
-    +1: jorton, jim, sf
- 
   * mod_sed, mod_log_debug: Symbol namespace cleanups.
     trunk patches: http://svn.apache.org/viewvc?rev=1326980&view=rev
                    http://svn.apache.org/viewvc?rev=1326984&view=rev

diff --git a/server/main.c b/server/main.c
index 9b88943f4d6a1fdf7128f4ef1716d4d974684681..28d1872055f96bb9559975a931a732fd7f51016c 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -671,6 +671,11 @@ int main(int argc, const char * const argv[])
         }
     }
 
+    /* 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 argv[])
         }
     }
 
-    /* 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) {