Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1082170 - /httpd/httpd/trunk/server/main.c
Date: Wed, 16 Mar 2011 15:53:34 -0000
To: cvs@httpd.apache.org
From: jorton@apache.org
Message-Id: <20110316155334.6FC2323888E7@eris.apache.org>

Author: jorton
Date: Wed Mar 16 15:53:34 2011
New Revision: 1082170

URL: http://svn.apache.org/viewvc?rev=1082170&view=rev
Log:
* server/main.c (main): Use the real null cleanup callback.

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=1082170&r1=1082169&r2=1082170&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Wed Mar 16 15:53:34 2011
@@ -621,7 +621,7 @@ int main(int argc, const char * const ar
         destroy_and_exit_process(process, 1);
     }
     apr_pool_cleanup_register(pconf, &ap_server_conf, ap_pool_cleanup_set_null,
-                              NULL);
+                              apr_pool_cleanup_null);
     apr_hook_sort_all();
 
     if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
@@ -709,7 +709,7 @@ int main(int argc, const char * const ar
             destroy_and_exit_process(process, 1);
         }
         apr_pool_cleanup_register(pconf, &ap_server_conf,
-                                  ap_pool_cleanup_set_null, NULL);
+                                  ap_pool_cleanup_set_null, apr_pool_cleanup_null);
         apr_hook_sort_all();
 
         if (ap_run_pre_config(pconf, plog, ptemp) != OK) {