core: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().

Just to be sure..

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

diff --git a/server/main.c b/server/main.c
index 5bc3b659e9d575ee4aace53882774ed995aed56d..9d25fe8a09cd588eedd1e8a91c7c406373378b59 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -717,6 +717,7 @@ static void usage(process_rec *process)
     if (temp_error_log) {
         ap_replace_stderr_log(process->pool, temp_error_log);
     }
+    ap_server_conf = NULL;
     if (!ap_read_config(process, ptemp, confname, &ap_conftree)) {
         if (showcompile) {
             /* Well, we tried. Show as much as we can, but exit nonzero to
@@ -824,6 +825,7 @@ static void usage(process_rec *process)
         apr_pool_create(&ptemp, pconf);
         apr_pool_tag(ptemp, "ptemp");
         ap_server_root = def_server_root;
+        ap_server_conf = NULL;
         if (!ap_read_config(process, ptemp, confname, &ap_conftree)) {
             destroy_and_exit_process(process, 1);
         }