]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 12:17:42 +0000 (20:17 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 12:17:42 +0000 (20:17 +0800)
* PHP-5.4:
  Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)

1  2 
ext/standard/file.c

Simple merge