From 11eb5a312dea1fdc15640dce16ea19de99daa843 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Wed, 15 Mar 2023 10:42:57 +0000 Subject: core: Follow up to r1908393: comment about where ap_server_conf is set. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908406 13f79535-47bb-0310-9956-ffa450edef68 --- server/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/main.c b/server/main.c index 9d25fe8a09..0aba609e02 100644 --- a/server/main.c +++ b/server/main.c @@ -717,7 +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; + ap_server_conf = NULL; /* set early by ap_read_config() for logging */ if (!ap_read_config(process, ptemp, confname, &ap_conftree)) { if (showcompile) { /* Well, we tried. Show as much as we can, but exit nonzero to @@ -825,7 +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; + ap_server_conf = NULL; /* set early by ap_read_config() for logging */ if (!ap_read_config(process, ptemp, confname, &ap_conftree)) { destroy_and_exit_process(process, 1); } -- cgit v1.2.1