cvs: php4 /main SAPI.c internal_functions_win32.c main.c php.h php_main.h /sapi/apache mod_php4.c /sapi/servlet servlet.c

zeev Tue Jul 24 16:30:40 2001 EDT Modified files: /php4/main SAPI.c internal_functions_win32.c main.c php.h php_main.h /php4/sapi/apache mod_php4.c /php4/sapi/servlet servlet.c Log: Get rid of the redundant global startup code Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.107 php4/main/SAPI.c:1.108 --- php4/main/SAPI.c:1.107 Tue Jul 17 12:46:06 2001 +++ php4/main/SAPI.c Tue Jul 24 16:30:33 2001 @@ -78,8 +78,6 @@ #endif reentrancy_startup(); - - php_global_startup_internal_extensions(); } SAPI_API void sapi_shutdown(void) @@ -93,7 +91,6 @@ tsrm_win32_shutdown(); #endif - php_global_shutdown_internal_extensions(); zend_hash_destroy(&known_post_content_types); } Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.42 php4/main/internal_functions_win32.c:1.43 --- php4/main/internal_functions_win32.c:1.42 Fri Jul 20 10:40:30 2001 +++ php4/main/internal_functions_win32.c Tue Jul 24 16:30:33 2001 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.42 2001/07/20 14:40:30 zeev Exp $ */ +/* $Id: internal_functions_win32.c,v 1.43 2001/07/24 20:30:33 zeev Exp $ */ /* {{{ includes */ @@ -88,16 +88,6 @@ int php_startup_internal_extensions(void) { return php_startup_extensions(php_builtin_extensions, EXTCOUNT); -} - -int php_global_startup_internal_extensions(void) -{ - return php_global_startup_extensions(php_builtin_extensions, EXTCOUNT); -} - -int php_global_shutdown_internal_extensions(void) -{ - return php_global_shutdown_extensions(php_builtin_extensions, EXTCOUNT); } Index: php4/main/main.c diff -u php4/main/main.c:1.383 php4/main/main.c:1.384 --- php4/main/main.c:1.383 Mon Jul 23 10:05:26 2001 +++ php4/main/main.c Tue Jul 24 16:30:33 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.383 2001/07/23 14:05:26 sas Exp $ */ +/* $Id: main.c,v 1.384 2001/07/24 20:30:33 zeev Exp $ */ /* {{{ includes */ @@ -768,43 +768,6 @@ } /* }}} */ -/* {{{ php_global_startup_extensions - */ -int php_global_startup_extensions(zend_module_entry **ptr, int count) -{ - zend_module_entry **end = ptr+count; - - while (ptr < end) { - if (*ptr) { - if ((*ptr)->global_startup_func && - (*ptr)->global_startup_func()==FAILURE) { - return FAILURE; - } - } - ptr++; - } - return SUCCESS; -} -/* }}} */ - -/* {{{ php_global_shutdown_extensions - */ -int php_global_shutdown_extensions(zend_module_entry **ptr, int count) -{ - zend_module_entry **end = ptr+count; - - while (ptr < end) { - if (*ptr) { - if ((*ptr)->global_shutdown_func && - (*ptr)->global_shutdown_func()==FAILURE) { - return FAILURE; - } - } - ptr++; - } - return SUCCESS; -} -/* }}} */ /* {{{ php_module_startup */ @@ -1296,6 +1259,7 @@ PLS_FETCH(); PG(connection_status) = PHP_CONNECTION_ABORTED; + php_output_set_status(0); if (!PG(ignore_user_abort)) { zend_bailout(); Index: php4/main/php.h diff -u php4/main/php.h:1.143 php4/main/php.h:1.144 --- php4/main/php.h:1.143 Fri Jul 20 10:40:30 2001 +++ php4/main/php.h Tue Jul 24 16:30:34 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.143 2001/07/20 14:40:30 zeev Exp $ */ +/* $Id: php.h,v 1.144 2001/07/24 20:30:34 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -266,8 +266,6 @@ /* functions */ int php_startup_internal_extensions(void); -int php_global_startup_internal_extensions(void); -int php_global_shutdown_internal_extensions(void); int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp) (const void *, const void *)); Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.11 php4/main/php_main.h:1.12 --- php4/main/php_main.h:1.11 Mon Apr 30 21:52:55 2001 +++ php4/main/php_main.h Tue Jul 24 16:30:34 2001 @@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.11 2001/05/01 01:52:55 hirokawa Exp $ */ +/* $Id: php_main.h,v 1.12 2001/07/24 20:30:34 zeev Exp $ */ #ifndef PHP_MAIN_H @@ -37,8 +37,6 @@ PHPAPI int php_module_shutdown_wrapper(sapi_module_struct *sapi_globals); PHPAPI int php_startup_extensions(zend_module_entry **ptr, int count); -PHPAPI int php_global_startup_extensions(zend_module_entry **ptr, int count); -PHPAPI int php_global_shutdown_extensions(zend_module_entry **ptr, int count); PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC); PHPAPI int php_handle_special_queries(SLS_D PLS_DC); Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.107 php4/sapi/apache/mod_php4.c:1.108 --- php4/sapi/apache/mod_php4.c:1.107 Sun Jul 22 21:03:22 2001 +++ php4/sapi/apache/mod_php4.c Tue Jul 24 16:30:37 2001 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.107 2001/07/23 01:03:22 sas Exp $ */ +/* $Id: mod_php4.c,v 1.108 2001/07/24 20:30:37 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -312,6 +312,7 @@ SLS_FETCH(); APLS_FETCH(); + php_output_set_status(0); SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */ if (AP(in_request)) { AP(in_request) = 0; Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.48 php4/sapi/servlet/servlet.c:1.49 --- php4/sapi/servlet/servlet.c:1.48 Sat Jul 21 11:11:30 2001 +++ php4/sapi/servlet/servlet.c Tue Jul 24 16:30:37 2001 @@ -272,7 +272,6 @@ (JNIEnv *jenv, jobject self) { php_module_shutdown(); - php_global_shutdown_extensions(additional_php_extensions, EXTCOUNT); #ifdef ZTS tsrm_shutdown(); #endif