diff options
| author | Yann Ylavic <ylavic@apache.org> | 2023-03-14 17:01:14 +0100 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2023-03-14 17:01:14 +0100 |
| commit | f0747086ec60b309c24ef268a3b14cd2ae6d5dd5 (patch) | |
| tree | bcdb83a0327cb25d2718bf1061f85c30064c551a /server | |
| parent | core: Set ap_server_conf ASAP. (diff) | |
| download | apache2-f0747086ec60b309c24ef268a3b14cd2ae6d5dd5.tar.xz apache2-f0747086ec60b309c24ef268a3b14cd2ae6d5dd5.zip | |
core: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().
Just to be sure..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908394 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server/main.c b/server/main.c index 5bc3b659e9..9d25fe8a09 100644 --- a/server/main.c +++ b/server/main.c @@ -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); } |