Commit15aaa9c

committed

Merge branch 'PHP-5.3' into PHP-5.4

2 parents6e684e6 +c05ee74 commit15aaa9cCopy full SHA for 15aaa9c

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

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(NULLTSRMLS_CC,E_WARNING, "Emptydelimiter");`
	`1814`	`+php_error_docref(NULLTSRMLS_CC,E_WARNING, "Emptyneedle");`
`1815`	`1815`	`RETURN_FALSE;`
`1816`	`1816`	`}`
`1817`	`1817`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+--TEST--`
	`2`	`+Bug #63943 (Bad warning text from strpos() on empty needle)`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+strpos("lllllll",'');`
	`6`	`+?>`
	`7`	`+--EXPECTF--`
	`8`	`+Warning: strpos(): Empty needle in %sbug63943.php on line %d`

Comments

(0)