diff options
| -rw-r--r-- | main/SAPI.c | 3 | ||||
| -rw-r--r-- | main/internal_functions_win32.c | 10 | ||||
| -rw-r--r-- | main/main.c | 38 | ||||
| -rw-r--r-- | main/php.h | 2 | ||||
| -rw-r--r-- | main/php_main.h | 2 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 1 | ||||
| -rw-r--r-- | sapi/servlet/servlet.c | 1 |
7 files changed, 2 insertions, 55 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index edab6bbe56..2cce6a85f2 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -78,8 +78,6 @@ SAPI_API void sapi_startup(sapi_module_struct *sf) #endif reentrancy_startup(); - - php_global_startup_internal_extensions(); } SAPI_API void sapi_shutdown(void) @@ -93,7 +91,6 @@ SAPI_API void sapi_shutdown(void) tsrm_win32_shutdown(); #endif - php_global_shutdown_internal_extensions(); zend_hash_destroy(&known_post_content_types); } diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 46d6d2c8b3..9666ef4085 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -90,16 +90,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); -} - /* * Local variables: diff --git a/main/main.c b/main/main.c index 3dbd93ee8a..f69ba04826 100644 --- a/main/main.c +++ b/main/main.c @@ -768,43 +768,6 @@ int php_startup_extensions(zend_module_entry **ptr, int count) } /* }}} */ -/* {{{ 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 @@ PHPAPI void php_handle_aborted_connection(void) PLS_FETCH(); PG(connection_status) = PHP_CONNECTION_ABORTED; + php_output_set_status(0); if (!PG(ignore_user_abort)) { zend_bailout(); diff --git a/main/php.h b/main/php.h index 9028452a43..910992a0f5 100644 --- a/main/php.h +++ b/main/php.h @@ -266,8 +266,6 @@ int cfgparse(void); /* 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 *)); diff --git a/main/php_main.h b/main/php_main.h index d8253f768f..e8b813620e 100644 --- a/main/php_main.h +++ b/main/php_main.h @@ -37,8 +37,6 @@ PHPAPI void php_module_shutdown_for_exec(void); 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); diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index a58df34143..fc9782016e 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -312,6 +312,7 @@ static void php_apache_request_shutdown(void *dummy) 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; diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c index 84d1493506..fd48663be9 100644 --- a/sapi/servlet/servlet.c +++ b/sapi/servlet/servlet.c @@ -272,7 +272,6 @@ JNIEXPORT void JNICALL Java_net_php_servlet_shutdown (JNIEnv *jenv, jobject self) { php_module_shutdown(); - php_global_shutdown_extensions(additional_php_extensions, EXTCOUNT); #ifdef ZTS tsrm_shutdown(); #endif |