cvs: php4 /main main.c php_main.h

andi Tue Feb 26 14:38:43 2002 EDT Modified files: /php4/main main.c php_main.h Log: - Hopefully fix the shutdown_memory_manager() stuff. Part of my previous - patch seems to have gotten lost Index: php4/main/main.c diff -u php4/main/main.c:1.424 php4/main/main.c:1.425 --- php4/main/main.c:1.424 Tue Feb 26 14:31:21 2002 +++ php4/main/main.c Tue Feb 26 14:38:40 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.424 2002/02/26 19:31:21 sebastian Exp $ */ +/* $Id: main.c,v 1.425 2002/02/26 19:38:40 andi Exp $ */ /* {{{ includes */ @@ -696,8 +696,10 @@ /* {{{ 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); Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.17 php4/main/php_main.h:1.18 --- php4/main/php_main.h:1.17 Tue Feb 26 13:59:27 2002 +++ php4/main/php_main.h Tue Feb 26 14:38:41 2002 @@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.17 2002/02/26 18:59:27 andi Exp $ */ +/* $Id: php_main.h,v 1.18 2002/02/26 19:38:41 andi Exp $ */ #ifndef 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);