Commit:    2d9d2cadadf0fdf12a01b4a689d0554e1450904f
Author:    Xinchen Hui <larue...@php.net>         Wed, 18 Jul 2012 20:16:27 
+0800
Parents:   8f89cfb548a733ec0d8004920be7d2e7e3cfe107
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=2d9d2cadadf0fdf12a01b4a689d0554e1450904f

Log:
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)

Bugs:
https://bugs.php.net/62597

Changed paths:
  M  NEWS
  M  ext/standard/file.c


Diff:
diff --git a/NEWS b/NEWS
index 280eb1f..34b48d9 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,10 @@ PHP                                                          
              NEWS
   . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when 
     moved to the end). (reeze....@gmail.com)
 
+- Streams:
+  . Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build).
+    (Laruence)
+
 ?? ??? 2012, PHP 5.4.5
 
 - Core:
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 7d01d31..cce0143 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)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to