diff options
author | Andi Gutmans <andi@php.net> | 2002-02-26 18:59:27 +0000 |
---|---|---|
committer | Andi Gutmans <andi@php.net> | 2002-02-26 18:59:27 +0000 |
commit | a3066657170a668fba36ff0fdd799eb2098da56f (patch) | |
tree | 1318af0b2f0b256a6a38484e0ababe81abf00036 /main | |
parent | a4113ee734600f0a77b6cbe0b04864c7933fdba5 (diff) | |
download | php-git-a3066657170a668fba36ff0fdd799eb2098da56f.tar.gz |
- Pass shutdown_memory_manager the TSRMLS context.
Diffstat (limited to 'main')
-rw-r--r-- | main/main.c | 4 | ||||
-rw-r--r-- | main/php_main.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index c88ea7fc97..6224035bac 100644 --- 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 ea9137c5f8..beeabb51c5 100644 --- 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); |