summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2023-03-15 10:42:57 +0000
committerYann Ylavic <ylavic@apache.org>2023-03-15 10:42:57 +0000
commit11eb5a312dea1fdc15640dce16ea19de99daa843 (patch)
tree586406fc21a6943a2c603731975cd1f2526589f8 /server
parentf0747086ec60b309c24ef268a3b14cd2ae6d5dd5 (diff)
downloadhttpd-11eb5a312dea1fdc15640dce16ea19de99daa843.tar.gz
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
Diffstat (limited to 'server')
-rw-r--r--server/main.c4
1 files changed, 2 insertions, 2 deletions
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);
}