From: Joe Orton <jorton@apache.org>
Date: Fri, 20 Apr 2012 12:16:02 +0000 (+0000)
Subject: * server/main.c (main): Bail out *before* signalling the server
X-Git-Tag: 2.5.0-alpha~7101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7131d34c942485ac3955271f24be3458f3fc1945;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328345 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/main.c b/server/main.c
index 9b88943f4d6..28d1872055f 100644
--- 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) {