com php-src: Merge remote branch 'upstream/master' into hash_password: ext/standard/basic_functions.c
| From: | Anthony Ferrara | Date: | Tue, 10 Jul 2012 14:33:51 +0000 |
| Subject: | com php-src: Merge remote branch 'upstream/master' into hash_password: ext/standard/basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70369@lists.php.net to get a copy of this message | ||
Commit: 99b7956ad58395853f7950ae01a43139413d348d
Author: Anthony Ferrara <ircmaxell@gmail.com> Tue, 10 Jul 2012 10:33:51 -0400
Parents: 9d3630b5dc8fa066dc4212ead2fffc8635f5bc0a b210766084cbd00b0e479d2800e1920271a3faba
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99b7956ad58395853f7950ae01a43139413d348d
Log:
Merge remote branch 'upstream/master' into hash_password
* upstream/master: (34 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
...
Bugs:
https://bugs.php.net/62500
https://bugs.php.net/62312
https://bugs.php.net/62433
https://bugs.php.net/62499
https://bugs.php.net/62507
https://bugs.php.net/52550
Changed paths:
MM ext/standard/basic_functions.c
Diff: