diff options
| author | Xinchen Hui <laruence@php.net> | 2013-01-09 10:57:47 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-01-09 10:57:47 +0800 |
| commit | 6deb8361f32d14fffdd284b47b59cd5dd50baf80 (patch) | |
| tree | fa1dfa37742ff4b83d30dda0e0718db12d839f22 | |
| parent | 9566314d626770c16875476a4c5dce0e63a57441 (diff) | |
| parent | f3b1b8516906fe900e521216c8f01e362790af30 (diff) | |
| download | php-git-6deb8361f32d14fffdd284b47b59cd5dd50baf80.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/standard/string.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug63943.phpt | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 771143d549..06c1984cd8 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -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; } diff --git a/ext/standard/tests/strings/bug63943.phpt b/ext/standard/tests/strings/bug63943.phpt new file mode 100644 index 0000000000..6018879b24 --- /dev/null +++ b/ext/standard/tests/strings/bug63943.phpt @@ -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 |