Get rid of the redundant global startup code

diff --git a/main/SAPI.c b/main/SAPI.c
index edab6bbe56d400033ca95d1d79896d5fce81e96d..2cce6a85f20f52f67d4da8cdb71b7d966cb562b3 100644 (file)
--- 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 46d6d2c8b333fe29147b5162c304b01aac87a395..9666ef408500db0a0cad16c4c5f6ffd911e8c6bb 100644 (file)
--- 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 3dbd93ee8a860799e967bae35ae46f36b93ab056..f69ba048263423e3a2d918cf1914a33651ad643b 100644 (file)
--- 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 9028452a431241843461402ec1eace450db0ab51..910992a0f5851adfb9c8fd52ed5f85bef9ea1d94 100644 (file)
--- 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 d8253f768f53874ca194322d0b767d44f5a053f0..e8b813620e2c05c565dfecf080b229c0becf1761 100644 (file)
--- 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 a58df34143f12f4a0790e5d9b58bdb9aab04fa00..fc9782016e7d7701fecdd9e9fd93ae52e5a1495a 100644 (file)
--- 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 84d1493506694c4b9254535d7fbfa87c6ad2ac94..fd48663be9a2cbd06d36145d6eed4dd52c7bd26b 100644 (file)
--- 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