Commit: ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4 Author: Stanislav Malyshev <s...@php.net> Mon, 20 May 2013 00:55:48 -0700 Parents: 0f02c3aa29fdf656457bfda1d1147b77ad9d1959 fb58e69a84f4fde603a630d2c9df2fa3be16d846 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix bug #64660 - yyparse can return 2, not only 1 Conflicts: Zend/zend_language_scanner.c Bugs: https://bugs.php.net/64660 Changed paths: MM NEWS MM Zend/zend_language_scanner.c MM Zend/zend_language_scanner.l Diff: diff --cc NEWS index 95ef3dc,2dc8815..2158504 --- a/NEWS +++ b/NEWS @@@ -1,10 -1,13 +1,12 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2013, PHP 5.4.16 +?? ??? 2013, PHP 5.5.0 Release Candidate 2 - Core: - . Fixed bug #64729 (compilation failure on x32). (Gustavo) + . Fixed bug #64660 (Segfault on memory exhaustion within function definition). + (Stas) - . Fixed bug #64853 (Use of no longer available ini directives causes crash on - TS build). (Anatol) + . 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) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
