iliaa Fri Nov 3 19:55:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
/php-src NEWS
Log:
Fixed bug #39361 (Removed warning on empty haystack inside mb_strstr()).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.16&r2=1.224.2.22.2.17&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.16
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.17
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.16 Fri Nov 3 02:26:50 2006
+++ php-src/ext/mbstring/mbstring.c Fri Nov 3 19:55:50 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.16 2006/11/03 02:26:50 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.17 2006/11/03 19:55:50 iliaa Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1809,10 +1809,6 @@
}
}
- if (haystack.len <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty haystack");
- RETURN_FALSE;
- }
if (needle.len <= 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,"Empty needle");
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.323&r2=1.2027.2.547.2.324&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.323 php-src/NEWS:1.2027.2.547.2.324
--- php-src/NEWS:1.2027.2.547.2.323 Fri Nov 3 19:04:19 2006
+++ php-src/NEWS Fri Nov 3 19:55:51 2006
@@ -5,6 +5,8 @@
. Fixed a bug when callback function returns a non-modified value.
. Added filter support for $_SERVER in cgi/apache2 sapis.
. Make sure PHP_SELF is filtered in Apache 1 sapi.
+- Fixed bug #39361 (Removed warning on empty haystack inside mb_strstr()).
+ (Ilia)
- Fixed bug #39354 (Allow building of curl extension against libcurl 7.16.0)
(Ilia)
- Fixed bug #39320 (ZEND_HASH_APPLY_STOP causes deletion). (Marcus)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
