mattwil Wed Apr 1 17:07:47 2009 UTC
Removed files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug47546.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard string.c
Log:
MFH: Fixed bug #47560 (explode()'s limit parameter odd behaviour) by
reverting change for bug #47546
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1456&r2=1.2027.2.547.2.1457&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1456 php-src/NEWS:1.2027.2.547.2.1457
--- php-src/NEWS:1.2027.2.547.2.1456 Tue Mar 31 17:21:02 2009
+++ php-src/NEWS Wed Apr 1 17:07:45 2009
@@ -25,8 +25,6 @@
literal). (Ilia)
- Fixed bug #47616 (curl keeps crashing). (Felipe)
- Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
-- Fixed bug #47546 (Default value for limit parameter in explode is 0, not -1).
- (Kalle)
- Fixed bug #47487 (performance degraded when reading large chunks after fix of
bug #44607). (Arnaud)
- Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.82&r2=1.445.2.14.2.83&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.82
php-src/ext/standard/string.c:1.445.2.14.2.83
--- php-src/ext/standard/string.c:1.445.2.14.2.82 Tue Mar 3 11:50:32 2009
+++ php-src/ext/standard/string.c Wed Apr 1 17:07:46 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.82 2009/03/03 11:50:32 kalle Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.83 2009/04/01 17:07:46 mattwil Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1042,7 +1042,7 @@
if (limit == 0 || limit == 1) {
add_index_stringl(return_value, 0, Z_STRVAL_PP(str),
Z_STRLEN_PP(str), 1);
- } else if (limit < -1 && argc == 3) {
+ } else if (limit < 0 && argc == 3) {
php_explode_negative_limit(*delim, *str, return_value, limit);
} else {
php_explode(*delim, *str, return_value, limit);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
