Commit: 0fd3572f4edbe7b3d9efdd212e214a9052dcfd01 Author: Xinchen Hui <larue...@php.net> Thu, 21 Mar 2013 11:14:10 +0800 Parents: 0881ff046686197984013e3ca3d84a797144ffcd Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0fd3572f4edbe7b3d9efdd212e214a9052dcfd01 Log: Fixed bug #64432 (more empty delimiter warning in strX methods) Bugs: https://bugs.php.net/64432 Changed paths: M NEWS M ext/standard/string.c M ext/standard/tests/strings/stristr_error.phpt M ext/standard/tests/strings/strstr.phpt Diff: diff --git a/NEWS b/NEWS index 4e4557f..d60fcb3 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2013, PHP 5.4.14 - Core + . Fixed bug #64432 (more empty delimiter warning in strX methods). (Laruence) . Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error). (Dmitry) . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). diff --git a/ext/standard/string.c b/ext/standard/string.c index 42bf198..77e0dff 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1715,7 +1715,7 @@ PHP_FUNCTION(stristr) if (Z_TYPE_P(needle) == IS_STRING) { char *orig_needle; if (!Z_STRLEN_P(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle"); efree(haystack_dup); RETURN_FALSE; } @@ -1765,7 +1765,7 @@ PHP_FUNCTION(strstr) if (Z_TYPE_P(needle) == IS_STRING) { if (!Z_STRLEN_P(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle"); RETURN_FALSE; } diff --git a/ext/standard/tests/strings/stristr_error.phpt b/ext/standard/tests/strings/stristr_error.phpt index 831d93f..2da35de 100644 --- a/ext/standard/tests/strings/stristr_error.phpt +++ b/ext/standard/tests/strings/stristr_error.phpt @@ -50,11 +50,11 @@ NULL -- Testing stristr() function with empty haystack -- -Warning: stristr(): Empty delimiter in %s on line %d +Warning: stristr(): Empty needle in %s on line %d bool(false) -- Testing stristr() function with empty needle -- -Warning: stristr(): Empty delimiter in %s on line %d +Warning: stristr(): Empty needle in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index 1c8d753..b135258 100644 Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
