diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-18 20:17:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-18 20:17:42 +0800 |
| commit | e7535e06e63104ccc0c90c4425b6c2541aa3c939 (patch) | |
| tree | 8f01870b82f558ebdeeb391165972b198f8b455c | |
| parent | 401230c7e181d97e9a8bf1abeeb294341c98727b (diff) | |
| parent | 2d9d2cadadf0fdf12a01b4a689d0554e1450904f (diff) | |
| download | php-git-e7535e06e63104ccc0c90c4425b6c2541aa3c939.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
| -rw-r--r-- | ext/standard/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 8bc556653f..5dc91b44b3 100644 --- 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) |