Commit: 111aa9fd2ecbfcc1d8048dca96932b3b954614bf Author: Dmitry Stogov <dmi...@zend.com> Tue, 20 Nov 2012 12:54:40 +0400 Parents: 75746d60b6e6a45512842e222429c127be58b733 396c1e990a0e513cf2e8510e9b6f82ab425c9e3a Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=111aa9fd2ecbfcc1d8048dca96932b3b954614bf Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS Bugs: https://bugs.php.net/63468 Changed paths: MM NEWS MM Zend/zend_API.c Diff: diff --cc NEWS index 3672fe0,717a382..d02a8c9 --- a/NEWS +++ b/NEWS @@@ -1,11 -1,27 +1,13 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2ß12, PHP 5.3.20 +?? ??? 2012, PHP 5.4.9 -- Zend Engine: - . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes - from value). (Pierrick) +- Core: + . Fixed bug #63468 (wrong called method as callback with inheritance). + (Laruence) -- Core: - . Fixed bug #63451 (config.guess file does not have AIX 7 defined, - shared objects are not created). (kemcline at au1 dot ibm dot com) -- Apache2 Handler SAPI: - . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) - - -?? ??? 2012, PHP 5.3.19 - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -ADD NEWS ONLY ABOVE IN 5.3.20 SECTION -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -RM will merge 5.3.19 entries when merging to release branch - -- Core + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). + (Tony, Andrew Sitnikov) . Fixed bug #63241 (PHP fails to open Windows deduplicated files). (daniel dot stelter-gliese at innogames dot de) . Fixed bug #62444 (Handle leak in is_readable on windows). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
