[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c /ext/standard/tests/strings explode.phpt

[Brian Shire]

shire           Sat Dec 27 05:15:51 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       string.c 
    /php-src/ext/standard/tests/strings explode.phpt 
  Log:
  MFH: fix explode behavior to respect negative limit when string is empty.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.38&r2=1.445.2.14.2.69.2.39&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.38 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.39
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.38  Fri Nov 21 19:16:50 2008
+++ php-src/ext/standard/string.c       Sat Dec 27 05:15:51 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.38 2008/11/21 19:16:50 felipe Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.39 2008/12/27 05:15:51 shire Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -1018,7 +1018,9 @@
        array_init(return_value);
 
        if (! Z_STRLEN_PP(str)) {
-               add_next_index_stringl(return_value, "", sizeof("") - 1, 1);
+               if (limit >= 0 || argc == 2) {
+                       add_next_index_stringl(return_value, "", sizeof("") - 
1, 1);
+               } 
                return;
        }
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.4.4.1.2.1&r2=1.4.4.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.1 
php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.2
--- php-src/ext/standard/tests/strings/explode.phpt:1.4.4.1.2.1 Tue Dec 18 
10:53:39 2007
+++ php-src/ext/standard/tests/strings/explode.phpt     Sat Dec 27 05:15:51 2008
@@ -17,6 +17,7 @@
 var_dump(@explode(NULL, a));
 var_dump(@explode("abc", "acb"));
 var_dump(@explode("somestring", "otherstring"));
+var_dump(@explode("somestring", "otherstring", -1));
 var_dump(@explode("a", "aaaaaa"));
 var_dump(@explode("==", str_repeat("-=".ord(0)."=-", 10)));
 var_dump(@explode("=", str_repeat("-=".ord(0)."=-", 10)));
@@ -63,6 +64,8 @@
   [0]=>
   string(11) "otherstring"
 }
+array(0) {
+}
 array(7) {
   [0]=>
   string(0) ""



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php