diff options
| author | Yann Ylavic <ylavic@apache.org> | 2023-03-14 15:48:41 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2023-03-14 15:48:41 +0000 |
| commit | feb15a2eb57e28d896b27a83c0e80f079a8ea509 (patch) | |
| tree | 7753a37623233ee7e50a2a4cd07568bfb501d511 /server/config.c | |
| parent | d51326e797fcf61fedecfa5126bf56723a36967a (diff) | |
| download | httpd-feb15a2eb57e28d896b27a83c0e80f079a8ea509.tar.gz | |
core: Set ap_server_conf ASAP.
* server/config.c(ap_read_config):
Set ap_server_conf as soon as it exists (with defaults).
* server/main.c(main):
Now that ap_server_conf is set by ap_read_config(), just make
sure it's not NULL afterward with an ap_assert()ion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908393 13f79535-47bb-0310-9956-ffa450edef68
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 5f88ea5718..b59fea1d4f 100644 --- a/server/config.c +++ b/server/config.c @@ -2308,6 +2308,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); |