clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.3' into PHP-5.4

Browse Source
This commit is contained in:
Xinchen Hui 2013-01-09 10:54:23 +08:00
commit 15aaa9c660
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/string.c
View File

@ -1811,7 +1811,7 @@ PHP_FUNCTION(strpos)
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;
}

8
ext/standard/tests/strings/bug63943.phpt Normal file
View File

@ -0,0 +1,8 @@
--TEST--
Bug #63943 (Bad warning text from strpos() on empty needle)
--FILE--
<?php
strpos("lllllll", '');
?>
--EXPECTF--
Warning: strpos(): Empty needle in %sbug63943.php on line %d