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

[yl...@apache.org]

Author: ylavic
Date: Tue Mar 14 16:01:14 2023
New Revision: 1908394

URL: http://svn.apache.org/viewvc?rev=1908394&view=rev
Log:
core: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().

Just to be sure..


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=1908394&r1=1908393&r2=1908394&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Tue Mar 14 16:01:14 2023
@@ -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);
         }