From 3eed8dfb7684c2bb4bf8f097c458f8f56166ab20 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Thu, 28 Jun 2007 17:22:56 +0000 Subject: [PATCH] fix crash on shutdown on Win32 patch by Scott --- sapi/apache2handler/sapi_apache2.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 1ee58e4936..08f4e34d32 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -349,8 +349,7 @@ static sapi_module_struct apache2_sapi_module = { STANDARD_SAPI_MODULE_PROPERTIES }; -static apr_status_t -php_apache_server_shutdown(void *tmp) +static apr_status_t php_apache_server_shutdown(void *tmp) { apache2_sapi_module.shutdown(&apache2_sapi_module); sapi_shutdown(); @@ -360,6 +359,15 @@ php_apache_server_shutdown(void *tmp) return APR_SUCCESS; } +static apr_status_t php_apache_child_shutdown(void *tmp) +{ + apache2_sapi_module.shutdown(&apache2_sapi_module); +#if defined(ZTS) && !defined(PHP_WIN32) + tsrm_shutdown(); +#endif + return APR_SUCCESS; +} + static void php_apache_add_version(apr_pool_t *p) { TSRMLS_FETCH(); @@ -648,7 +656,7 @@ zend_first_try { 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); + apr_pool_cleanup_register(pchild, NULL, php_apache_child_shutdown, apr_pool_cleanup_null); } void php_ap2_register_hook(apr_pool_t *p) -- 2.40.0