Commit: a6a3aa5d4930bd5134cc5f16e0c931c4a532b1da Author: Xinchen Hui <larue...@php.net> Mon, 24 Jun 2013 23:49:30 +0800 Parents: ecd9d7625098bfc0a14ffa1fc39535848e71fc80 9cf3e65391d6aa637e5471449499e957cff6ee89 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a6a3aa5d4930bd5134cc5f16e0c931c4a532b1da Log: Merge branch 'PHP-5.4' into PHP-5.5 Conflicts: Zend/zend_API.c Changed paths: MM NEWS MM Zend/zend_API.c Diff: diff --cc NEWS index 0a57834,2dbe468..a777e8d --- a/NEWS +++ b/NEWS @@@ -1,14 -1,12 +1,15 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2013, PHP 5.4.18 +?? ??? 2013, PHP 5.5.1 - Core: - . Fixed bug #65108 (is_callable() triggers Fatal Error). - (David Soria Parra, Laruence) . Fixed bug #65088 (Generated configure script is malformed on OpenBSD). (Adam) - . Fixed bug #65108 (is_callable() triggers Fatal Error). (David Soria Parra) ++ . Fixed bug #65108 (is_callable() triggers Fatal Error). ++ (David Soria Parra, Laruence) + +OPcache + . OPcache must be compatible with LiteSpeed SAPI (Dmitry) - CLI server: . Fixed bug #65066 (Cli server not responsive when responding with 422 http -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
