Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit 6deb8361f32d · 2013-01-09T10:57:47.000+08:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1811,7 +1811,7 @@ PHP_FUNCTION(strpos)`
`1811`	`1811`
`1812`	`1812`	`if (Z_TYPE_P(needle) == IS_STRING) {`
`1813`	`1813`	`if (!Z_STRLEN_P(needle)) {`
`1814`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");`
	`1814`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle");`
`1815`	`1815`	`RETURN_FALSE;`
`1816`	`1816`	`}`
`1817`	`1817`