Fix init bug

diff --git a/ext/standard/output.c b/ext/standard/output.c
index 248c4a16cb2ce95a980a88e84def8dc0c50dc1ce..fa49c05035f5895701face772b00ed6774a5b68f 100644 (file)
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -50,7 +50,6 @@ static void php_output_init_globals(OLS_D)
        OG(implicit_flush) = 0;
        OG(output_start_filename) = NULL;
        OG(output_start_lineno) = 0;
-       OG(lock) = 0;
 }
 
 
@@ -73,6 +72,7 @@ PHPAPI void php_output_startup()
        OG(php_body_write) = php_ub_body_write;
        OG(php_header_write) = sapi_module.ub_write;
        OG(nesting_level) = 0;
+       OG(lock) = 0;
 }
 
 PHPAPI int php_body_write(const char *str, uint str_length)

diff --git a/main/output.c b/main/output.c
index 248c4a16cb2ce95a980a88e84def8dc0c50dc1ce..fa49c05035f5895701face772b00ed6774a5b68f 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -50,7 +50,6 @@ static void php_output_init_globals(OLS_D)
        OG(implicit_flush) = 0;
        OG(output_start_filename) = NULL;
        OG(output_start_lineno) = 0;
-       OG(lock) = 0;
 }
 
 
@@ -73,6 +72,7 @@ PHPAPI void php_output_startup()
        OG(php_body_write) = php_ub_body_write;
        OG(php_header_write) = sapi_module.ub_write;
        OG(nesting_level) = 0;
+       OG(lock) = 0;
 }
 
 PHPAPI int php_body_write(const char *str, uint str_length)