- Fix problem of output initialization

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b8ed7cdcafe5d67f78e3d21dd79a5bc8826716c3..c43bfdaa019a3bb8128ca065b2aa8ede31500539 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -751,7 +751,6 @@ PHP_MINIT_FUNCTION(basic)
        register_html_constants(INIT_FUNC_ARGS_PASSTHRU);
        register_string_constants(INIT_FUNC_ARGS_PASSTHRU);
 
-       PHP_MINIT(output)(INIT_FUNC_ARGS_PASSTHRU);
        PHP_MINIT(regex)(INIT_FUNC_ARGS_PASSTHRU);
        PHP_MINIT(file)(INIT_FUNC_ARGS_PASSTHRU);
        PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU);

diff --git a/ext/standard/output.c b/ext/standard/output.c
index 701c20d5f45624d1527f3608aeac71de3d15b302..0409a1c261dfc8b4f2f864d275d3a0756838220d 100644 (file)
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -59,7 +59,8 @@ static void php_output_init_globals(OLS_D)
 }
 
 
-PHP_MINIT_FUNCTION(output)
+/* Start output layer */
+PHPAPI void php_output_startup()
 {
 #ifdef ZTS
        output_globals_id = ts_allocate_id(sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL);
@@ -67,18 +68,14 @@ PHP_MINIT_FUNCTION(output)
        php_output_init_globals(OLS_C);
 #endif
 
-       return SUCCESS;
-}
+       {
+               OLS_FETCH();
 
-/* Start output layer */
-PHPAPI void php_output_startup()
-{
-       OLS_FETCH();
-
-       OG(php_body_write) = php_ub_body_write;
-       OG(php_header_write) = sapi_module.ub_write;
-       OG(nesting_level) = 0;
-       OG(lock) = 0;
+               OG(php_body_write) = php_ub_body_write;
+               OG(php_header_write) = sapi_module.ub_write;
+               OG(nesting_level) = 0;
+               OG(lock) = 0;
+       }
 }
 
 

diff --git a/ext/standard/php_output.h b/ext/standard/php_output.h
index ab9f7999058bf5d565de325d03d12795753f109e..58a3db8c15d51160c141dd031597602518ed8e7b 100644 (file)
--- a/ext/standard/php_output.h
+++ b/ext/standard/php_output.h
@@ -47,8 +47,6 @@ PHP_FUNCTION(ob_get_contents);
 PHP_FUNCTION(ob_get_length);
 PHP_FUNCTION(ob_implicit_flush);
 
-PHP_MINIT_FUNCTION(output);
-
 typedef struct _php_ob_buffer {
        char *buffer;
        uint size;

diff --git a/main/output.c b/main/output.c
index 701c20d5f45624d1527f3608aeac71de3d15b302..0409a1c261dfc8b4f2f864d275d3a0756838220d 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -59,7 +59,8 @@ static void php_output_init_globals(OLS_D)
 }
 
 
-PHP_MINIT_FUNCTION(output)
+/* Start output layer */
+PHPAPI void php_output_startup()
 {
 #ifdef ZTS
        output_globals_id = ts_allocate_id(sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL);
@@ -67,18 +68,14 @@ PHP_MINIT_FUNCTION(output)
        php_output_init_globals(OLS_C);
 #endif
 
-       return SUCCESS;
-}
+       {
+               OLS_FETCH();
 
-/* Start output layer */
-PHPAPI void php_output_startup()
-{
-       OLS_FETCH();
-
-       OG(php_body_write) = php_ub_body_write;
-       OG(php_header_write) = sapi_module.ub_write;
-       OG(nesting_level) = 0;
-       OG(lock) = 0;
+               OG(php_body_write) = php_ub_body_write;
+               OG(php_header_write) = sapi_module.ub_write;
+               OG(nesting_level) = 0;
+               OG(lock) = 0;
+       }
 }
 
 

diff --git a/main/php_output.h b/main/php_output.h
index ab9f7999058bf5d565de325d03d12795753f109e..58a3db8c15d51160c141dd031597602518ed8e7b 100644 (file)
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -47,8 +47,6 @@ PHP_FUNCTION(ob_get_contents);
 PHP_FUNCTION(ob_get_length);
 PHP_FUNCTION(ob_implicit_flush);
 
-PHP_MINIT_FUNCTION(output);
-
 typedef struct _php_ob_buffer {
        char *buffer;
        uint size;