svn commit: r1328345 - /httpd/httpd/trunk/server/main.c

[jo...@apache.org]

Author: jorton
Date: Fri Apr 20 12:16:02 2012
New Revision: 1328345

URL: http://svn.apache.org/viewvc?rev=1328345&view=rev
Log:
* server/main.c (main): Bail out *before* signalling the server
  if the config is bad. (as per the claim in the docs!)

Modified:
    httpd/httpd/trunk/server/main.c

Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=1328345&r1=1328344&r2=1328345&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Fri Apr 20 12:16:02 2012
@@ -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) {