From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 14 Mar 2023 16:01:14 +0000 (+0000)
Subject: core: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().
X-Git-Tag: 2.5.0-alpha2-ci-test-only~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0747086ec60b309c24ef268a3b14cd2ae6d5dd5;p=thirdparty%2Fapache%2Fhttpd.git

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 5bc3b659e9d..9d25fe8a09c 100644
--- 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);
         }