Fixed bug #39361 (Removed warning on empty haystack inside mb_strstr()).

diff --git a/NEWS b/NEWS
index 5057071355889497dc59af3b418630c6a373250c..733cda0366cc9ae36dbe6c8095164b7936f45b11 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP                                                                        NEWS
   . 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)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index dbf27b77a2b8297590fc2bbfd6fbcfef284d1d3a..7541f2a897217a7c3be9d49a4b7e7becfbb9927a 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1809,10 +1809,6 @@ PHP_FUNCTION(mb_strstr)
                }
        }
 
-       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;