From: Stefan Fritsch <sf@apache.org>
Date: Fri, 11 Mar 2011 22:16:16 +0000 (+0000)
Subject: Ensure that ap_server_conf always points to valid data or is NULL.
X-Git-Tag: 2.3.12~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7edefbbe424ba4d82cdf4b8ed6e19ba00115c24;p=thirdparty%2Fapache%2Fhttpd.git

Ensure that ap_server_conf always points to valid data or is NULL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080784 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/main.c b/server/main.c
index dba315a06ca..5c40a6bd861 100644
--- a/server/main.c
+++ b/server/main.c
@@ -620,6 +620,8 @@ int main(int argc, const char * const argv[])
     if (!ap_server_conf) {
         destroy_and_exit_process(process, 1);
     }
+    apr_pool_cleanup_register(pconf, &ap_server_conf, ap_pool_cleanup_set_null,
+                              NULL);
     apr_hook_sort_all();
 
     if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
@@ -706,6 +708,8 @@ int main(int argc, const char * const argv[])
         if (!ap_server_conf) {
             destroy_and_exit_process(process, 1);
         }
+        apr_pool_cleanup_register(pconf, &ap_server_conf,
+                                  ap_pool_cleanup_set_null, NULL);
         apr_hook_sort_all();
 
         if (ap_run_pre_config(pconf, plog, ptemp) != OK) {