com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: Zend/zend _hash.c ext/curl/interface.c
ext/mysqli/mysqli_nona pi.c sapi/phpdbg/phpdbg.c

Commit: 2044884812f9b7ab08ecb72ab9edf78645b78a84 Author: Anatol Belski <ab@php.net> Sun, 4 May 2014 21:12:47 +0200 Parents: ba19cc7b451b9063dd349d681d2c231648de7207 003ba74d99846755e5c2b5f562531f9b12d9bfb1 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2044884812f9b7ab08ecb72ab9edf78645b78a84 Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: (28 commits) /me blushes, really hard only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654 Fix mysqli build when building against libmysqlclient. Fix author name on the #63228 patch. Fixed bug #67169: []= after_array_splice incorrect Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess. show leaks in their own group Use the right path for the suggested PHP invocation in ext_skel. Changed to more understandable NEWS message one heading is enough add new NEWS block for alpha3 XFAIL the leaking multibyte tests, we should really get to the bottom of this Fixed numbering in UPGRADING file Updated NEWS for fixed phpdbg issue #85 Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85 Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85 add missing NEWS entry to the correct release where it was added 5.5.12 was released yesterday add missing NEWS entry to the correct release where it was added Updated NEWS entry for phpdbg ... Conflicts: ext/curl/interface.c Bugs: https://bugs.php.net/63228 https://bugs.php.net/67169 https://bugs.php.net/85 Changed paths: MM Zend/zend_hash.c MM ext/curl/interface.c MM ext/mysqli/mysqli_nonapi.c MM sapi/phpdbg/phpdbg.c Diff: