You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2023/03/15 10:42:58 UTC
svn commit: r1908406 - /httpd/httpd/trunk/server/main.c
Author: ylavic
Date: Wed Mar 15 10:42:57 2023
New Revision: 1908406
URL: http://svn.apache.org/viewvc?rev=1908406&view=rev
Log:
core: Follow up to r1908393: comment about where ap_server_conf is set.
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=1908406&r1=1908405&r2=1908406&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Wed Mar 15 10:42:57 2023
@@ -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);
}