summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/main.c2
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);
}