Fix a major thread safety bug in the output mechanism

@- Fixed a major memory corruption bug in the thread safe version (Zeev)

1 files changed, 10 insertions, 8 deletions

diff --git a/ext/standard/output.c b/ext/standard/output.c
index cacf045a0c..c29ef41900 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -61,22 +61,24 @@ static void php_output_init_globals(OLS_D)
 
 
 /* Start output layer */
-PHPAPI void php_output_startup()
+PHPAPI void php_output_startup(void)
 {
 #ifdef ZTS
 	output_globals_id = ts_allocate_id(sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL);
 #else 
 	php_output_init_globals(OLS_C);
 #endif
+}
 
-	{
-		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;
-	}
+PHPAPI void php_output_activate(void)
+{
+	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;
 }