From: Dmitry Stogov Date: Tue, 21 May 2013 06:15:37 +0000 (+0400) Subject: Merge branch 'PHP-5.4' into PHP-5.5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2d6d274584d5df2aa9c040396066d30ffd44d82;p=php Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #64720 (SegFault on zend_deactivate) Conflicts: NEWS --- a2d6d274584d5df2aa9c040396066d30ffd44d82 diff --cc NEWS index 7a19c7b856,5bf6872bc2..4e9ba71a34 --- a/NEWS +++ b/NEWS @@@ -1,12 -1,14 +1,13 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2013, PHP 5.4.16 +?? ??? 2013, PHP 5.5.0 Release Candidate 2 - Core: - . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry) - . Fixed bug #64729 (compilation failure on x32). (Gustavo) . Fixed bug #64660 (Segfault on memory exhaustion within function definition). (Stas, reported by Juha Kylmänen) - . Fixed bug #64853 (Use of no longer available ini directives causes crash on - TS build). (Anatol) ++ . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry) + . Fixed bug #64853 (Use of no longer available ini directives causes crash + on TS build). (Anatol) - Fileinfo: . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)