Merge branch 'PHP-5.4'

laruence · laruence · commit e7535e06e631 · 2012-07-18T20:17:42.000+08:00
* PHP-5.4:
  Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -161,6 +161,7 @@ static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC)
 	FG(pclose_ret) = 0;
 	FG(user_stream_current_filename) = NULL;
 	FG(def_chunk_size) = PHP_SOCK_CHUNK_SIZE;
+	FG(wrapper_errors) = NULL;
 }
 
 static void file_globals_dtor(php_file_globals *file_globals_p TSRMLS_DC)

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC)`
`161`	`161`	`FG(pclose_ret) = 0;`
`162`	`162`	`FG(user_stream_current_filename) = NULL;`
`163`	`163`	`FG(def_chunk_size) = PHP_SOCK_CHUNK_SIZE;`
	`164`	`+ FG(wrapper_errors) = NULL;`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`static void file_globals_dtor(php_file_globals *file_globals_p TSRMLS_DC)`