- Pass shutdown_memory_manager the TSRMLS context.

diff --git a/main/main.c b/main/main.c
index c88ea7fc979bd84f32ba6c89ba2380acb6b2d9a1..6224035bacd5d9ac73c329c1f9c0bd0d4a3be54e 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -698,9 +698,11 @@ int php_request_startup(TSRMLS_D)
  */
 void php_request_shutdown_for_exec(void *dummy)
 {
+       TSRMLS_FETCH();
+
        /* used to close fd's in the 3..255 range here, but it's problematic
         */
-       shutdown_memory_manager(1, 1);
+       shutdown_memory_manager(1, 1 TSRMLS_CC);
 }
 /* }}} */
 

diff --git a/main/php_main.h b/main/php_main.h
index ea9137c5f85f5101da3120732f20954bd5391aff..beeabb51c5415d336d53dfaf00472e5118df730e 100644 (file)
--- a/main/php_main.h
+++ b/main/php_main.h
@@ -30,7 +30,7 @@
 
 PHPAPI int php_request_startup(TSRMLS_D);
 PHPAPI void php_request_shutdown(void *dummy);
-PHPAPI void php_request_shutdown_for_exec(void *dummy);
+PHPAPI void php_request_shutdown_for_exec(void *dummy TSRMLS_DC);
 PHPAPI int php_module_startup(sapi_module_struct *sf);
 PHPAPI void php_module_shutdown(TSRMLS_D);
 PHPAPI void php_module_shutdown_for_exec(void);