From 3161ed034bbea40a705303811d7213aff9be17d2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 01:56:20 +0200 Subject: Merging upstream version 2.4.59. Signed-off-by: Daniel Baumann --- server/config.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'server/config.c') diff --git a/server/config.c b/server/config.c index be889db..3d11ff5 100644 --- a/server/config.c +++ b/server/config.c @@ -2301,6 +2301,9 @@ AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp, if (s == NULL) { return s; } + if (ap_server_conf == NULL) { + ap_server_conf = s; + } init_config_globals(p); -- cgit v1.2.3