]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
core: Follow up to r1908393: comment about where ap_server_conf is set.
authorYann Ylavic <ylavic@apache.org>
Wed, 15 Mar 2023 10:42:57 +0000 (10:42 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 15 Mar 2023 10:42:57 +0000 (10:42 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908406 13f79535-47bb-0310-9956-ffa450edef68

server/main.c

index 9d25fe8a09cd588eedd1e8a91c7c406373378b59..0aba609e026fb3f97f6432760a743dfd4b99c977 100644 (file)
@@ -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);
         }