From 1b32da412d9c12c55d6f13f19562fd4f21aec8a6 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 26 Feb 2002 19:31:21 +0000 Subject: [PATCH] TSRM Cleanup. --- main/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main/main.c b/main/main.c index 6224035bac..f756479fc1 100644 --- a/main/main.c +++ b/main/main.c @@ -696,10 +696,8 @@ int php_request_startup(TSRMLS_D) /* {{{ php_request_shutdown_for_exec */ -void php_request_shutdown_for_exec(void *dummy) +void php_request_shutdown_for_exec(void *dummy TSRMLS_DC) { - TSRMLS_FETCH(); - /* used to close fd's in the 3..255 range here, but it's problematic */ shutdown_memory_manager(1, 1 TSRMLS_CC); @@ -744,7 +742,7 @@ void php_request_shutdown(void *dummy) } zend_end_try(); zend_try { - shutdown_memory_manager(CG(unclean_shutdown), 0); + shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC); } zend_end_try(); zend_try { @@ -1009,7 +1007,7 @@ void php_module_shutdown(TSRMLS_D) #ifndef ZTS zend_ini_shutdown(TSRMLS_C); - shutdown_memory_manager(CG(unclean_shutdown), 1); + shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC); #endif module_initialized = 0; -- 2.50.1