- Hopefully fix the shutdown_memory_manager() stuff. Part of my previous

- patch seems to have gotten lost

diff --git a/main/main.c b/main/main.c
index f756479fc1d7f668cc65eebc93a2c96f920a09cf..e09e9765e70c805367628b5987172dfab6d41cd5 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -696,8 +696,10 @@ int php_request_startup(TSRMLS_D)
 
 /* {{{ php_request_shutdown_for_exec
  */
-void php_request_shutdown_for_exec(void *dummy TSRMLS_DC)
+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 TSRMLS_CC);

diff --git a/main/php_main.h b/main/php_main.h
index beeabb51c5415d336d53dfaf00472e5118df730e..ea9137c5f85f5101da3120732f20954bd5391aff 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 TSRMLS_DC);
+PHPAPI void php_request_shutdown_for_exec(void *dummy);
 PHPAPI int php_module_startup(sapi_module_struct *sf);
 PHPAPI void php_module_shutdown(TSRMLS_D);
 PHPAPI void php_module_shutdown_for_exec(void);