From 6d76fc283405217496e52bd7627c85a849328d08 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 1 Jun 2007 10:04:06 +0000 Subject: [PATCH] MFH: fix #39330 (apache2handler does not call shutdown actions before apache child die) --- NEWS | 2 ++ sapi/apache2handler/sapi_apache2.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/NEWS b/NEWS index 0a1469c722c..4a4313b6edf 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2007, PHP 5.2.4 +- Fixed bug #39330 (apache2handler does not call shutdown actions before + apache child die). (isk at ecommerce dot com, Gopal, Tony) 31 May 2007, PHP 5.2.3 - Changed CGI install target to php-cgi and 'make install' to install CLI diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index dcc0118b681..618a7c81b0b 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -651,11 +651,17 @@ zend_first_try { return OK; } +static void php_apache_child_init(apr_pool_t *pchild, server_rec *s) +{ + apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, apr_pool_cleanup_null); +} + void php_ap2_register_hook(apr_pool_t *p) { ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE); } /*