From 69f568eb1183a2a1f5148e6db34a8d42e0e52ff6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 12:03:17 +0200
Subject: Adding upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 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