diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 13:43:02 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 13:43:02 +0000 |
| commit | be1b1255f7fb08f598e2c251b13db93b2020e692 (patch) | |
| tree | e80bdc42ae06751337712ca1e310820210b3af9c /server/config.c | |
| parent | Releasing progress-linux version 2.4.57-2progress7u1. (diff) | |
| download | apache2-be1b1255f7fb08f598e2c251b13db93b2020e692.tar.xz apache2-be1b1255f7fb08f598e2c251b13db93b2020e692.zip | |
Merging upstream version 2.4.59.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'server/config.c')
| -rw-r--r-- | server/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |