diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-06-01 10:04:06 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-06-01 10:04:06 +0000 |
| commit | 6d76fc283405217496e52bd7627c85a849328d08 (patch) | |
| tree | acd2f8e660a2e4c7f352c907c7509d4d6c9f5140 | |
| parent | de64609fec4ee4db530cf7711106b44aa43270d9 (diff) | |
| download | php-git-6d76fc283405217496e52bd7627c85a849328d08.tar.gz | |
MFH: fix #39330 (apache2handler does not call shutdown actions before apache child die)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 |
2 files changed, 8 insertions, 0 deletions
@@ -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 dcc0118b68..618a7c81b0 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); } /* |