cvs: php4 /ext/standard string.c
| From: | Hartmut Holzgraefe | Date: | Thu, 05 Sep 2002 11:12:01 +0000 |
| Subject: | cvs: php4 /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13844@lists.php.net to get a copy of this message | ||
hholzgra Thu Sep 5 07:12:01 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
in stristr:
this check was in the wrong place, the real version was some lines
below, this one assumed the type was 'string' in any case
now it looks like strstr
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.286 php4/ext/standard/string.c:1.287
--- php4/ext/standard/string.c:1.286 Sun Aug 25 15:08:07 2002
+++ php4/ext/standard/string.c Thu Sep 5 07:12:01 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.286 2002/08/25 19:08:07 iliaa Exp $ */
+/* $Id: string.c,v 1.287 2002/09/05 11:12:01 hholzgra Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1290,11 +1290,6 @@
SEPARATE_ZVAL(needle);
convert_to_string_ex(haystack);
-
- if (!Z_STRLEN_PP(needle)) {
- php_error(E_WARNING, "Empty Delimiter");
- RETURN_FALSE;
- }
haystack_orig = estrndup(Z_STRVAL_PP(haystack), Z_STRLEN_PP(haystack));