httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1080784 - /httpd/httpd/trunk/server/main.c
Date Fri, 11 Mar 2011 22:16:16 GMT
Author: sf
Date: Fri Mar 11 22:16:16 2011
New Revision: 1080784

URL: http://svn.apache.org/viewvc?rev=1080784&view=rev
Log:
Ensure that ap_server_conf always points to valid data or is NULL.

Modified:
    httpd/httpd/trunk/server/main.c

Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=1080784&r1=1080783&r2=1080784&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Fri Mar 11 22:16:16 2011
@@ -620,6 +620,8 @@ int main(int argc, const char * const ar
     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 ar
         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) {



Mime
View raw message