diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2012-07-10 10:33:51 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2012-07-10 10:33:51 -0400 |
| commit | 99b7956ad58395853f7950ae01a43139413d348d (patch) | |
| tree | 3380292c8bd8211390b768d1f7c5e958840d99ae /ext/standard/basic_functions.c | |
| parent | 9d3630b5dc8fa066dc4212ead2fffc8635f5bc0a (diff) | |
| parent | b210766084cbd00b0e479d2800e1920271a3faba (diff) | |
| download | php-git-99b7956ad58395853f7950ae01a43139413d348d.tar.gz | |
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
...
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index e6500dd66b..e6b155979f 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3903,7 +3903,7 @@ PHP_NAMED_FUNCTION(php_inet_ntop) } if (!inet_ntop(af, address, buffer, sizeof(buffer))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unknown error occured"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An unknown error occurred"); RETURN_FALSE; } |