Commit: deeacc7106186470f7873b291feaca2e474b3c74 Author: Stanislav Malyshev <s...@php.net> Fri, 18 Jan 2013 13:42:04 -0800 Parents: 6dc80f080ea97c09b36d8a05ec7ec5067f394c01 9e7c2e5906d1ec943afe7f6a0daf613a36ba2137 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=deeacc7106186470f7873b291feaca2e474b3c74 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix bug #63462 (Magic methods called twice for unset protected properties) NEWS for bug #64011. See 77ee200 Fix bug #64011 (get_html_translation_table()) Fix News Update the arguments in the prototype of fpm_socket_unix_test_connect(). fixed build NEWS for bug #63893 Fixed inconsequential bug in strtr() Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa." Revert "Update fputcsv() to escape all characters equally." Remove _GNU_SOURCE, add local heap sort The compiler can figure this out Remove unused block strtr() with 2nd param array - optimization Refactoring, bugs & leaks Optimize strtr w/ 2nd arg array Bugs: https://bugs.php.net/63462 https://bugs.php.net/64011 https://bugs.php.net/63893 Changed paths: MM Zend/zend_object_handlers.c MM ext/standard/file.c MM ext/standard/string.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php