]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* server/main.c (main): Bail out *before* signalling the server
authorJoe Orton <jorton@apache.org>
Fri, 20 Apr 2012 12:16:02 +0000 (12:16 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 20 Apr 2012 12:16:02 +0000 (12:16 +0000)
  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

server/main.c

index 9b88943f4d6a1fdf7128f4ef1716d4d974684681..28d1872055f96bb9559975a931a732fd7f51016c 100644 (file)
@@ -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) {