From: Anthony Ferrara Date: Tue, 10 Jul 2012 14:31:25 +0000 (-0400) Subject: Merge remote branch 'upstream/master' into hash_pbkdf2 X-Git-Tag: php-5.5.0alpha1~91 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=731c6fd274932a4d31a76a38a4006cad6ffc50d3;p=php Merge remote branch 'upstream/master' into hash_pbkdf2 * upstream/master: (101 commits) Fixed Bug #62500 (Segfault in DateInterval class when extended) Fixed test bug #62312 (warnings changed one more time) fix valgrind warning fix valgrind warning fixed #62433 test for win update NEWS Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false) appease MSVC (doesnt like unary minus of unsigned ints) appease MSVC (doesnt like unary minus of unsigned ints) appease MSVC (doesnt like unary minus of unsigned ints) - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds) Fixed Bug #62500 (Segfault in DateInterval class when extended) Added in NEWS and UPGRADING for feature 55218 Fix two issues with run-tests.php Fix potential integer overflow in nl2br Fix potential integer overflow in bin2hex This wil be PHP 5.3.16 Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too. fix (signed) integer overflow (part of bug #52550 fix (signed) integer overflow (part of bug #52550 ... --- 731c6fd274932a4d31a76a38a4006cad6ffc50d3