]> granicus.if.org Git - php/commit
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)
commite7535e06e63104ccc0c90c4425b6c2541aa3c939
tree8f01870b82f558ebdeeb391165972b198f8b455c
parent401230c7e181d97e9a8bf1abeeb294341c98727b
parent2d9d2cadadf0fdf12a01b4a689d0554e1450904f
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
ext/standard/file.c