cvs: php-src(PHP_5_0) / NEWS /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt

iliaa Sun Apr 3 14:09:27 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/standard string.c /php-src/ext/standard/tests/strings chunk_split.phpt /php-src NEWS Log: MFH: Fixed bug #32530 (chunk_split() does not append endstr if chunklen is longer then the original string). http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.420.2.6&r2=1.420.2.7&ty=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.420.2.6 php-src/ext/standard/string.c:1.420.2.7 --- php-src/ext/standard/string.c:1.420.2.6 Tue Mar 1 10:01:08 2005 +++ php-src/ext/standard/string.c Sun Apr 3 14:09:23 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.420.2.6 2005/03/01 15:01:08 hyanantha Exp $ */ +/* $Id: string.c,v 1.420.2.7 2005/04/03 18:09:23 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1839,7 +1839,13 @@ } if (chunklen > Z_STRLEN_PP(p_str)) { - RETURN_STRINGL(Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str), 1); + /* to maintain BC, we must return original string + ending */ + result_len = endlen + Z_STRLEN_PP(p_str); + result = emalloc(result_len + 1); + memcpy(result, Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str)); + memcpy(result + Z_STRLEN_PP(p_str), end, endlen); + result[result_len] = '\0'; + RETURN_STRINGL(result, result_len, 0); } if (!Z_STRLEN_PP(p_str)) { http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.2&r2=1.2.2.1&ty=u Index: php-src/ext/standard/tests/strings/chunk_split.phpt diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.2 php-src/ext/standard/tests/strings/chunk_split.phpt:1.2.2.1 --- php-src/ext/standard/tests/strings/chunk_split.phpt:1.2 Wed May 19 04:45:23 2004 +++ php-src/ext/standard/tests/strings/chunk_split.phpt Sun Apr 3 14:09:25 2005 @@ -5,6 +5,7 @@ echo chunk_split('abc', 1, '-')."\n"; echo chunk_split('foooooooooooooooo', 5)."\n"; echo chunk_split(str_repeat('X', 2*76))."\n"; +echo chunk_split("test", 10, "|end") . "\n"; ?> --EXPECT-- a-b-c- @@ -15,3 +16,5 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + +test|end http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.304&r2=1.1760.2.305&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.304 php-src/NEWS:1.1760.2.305 --- php-src/NEWS:1.1760.2.304 Sun Apr 3 03:51:11 2005 +++ php-src/NEWS Sun Apr 3 14:09:25 2005 @@ -1,5 +1,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2005, PHP 5.0.5 +- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is + longer then the original string). (Ilia) + 31 Mar 2005, PHP 5.0.4 - Added SNMPv2 support. (harrie) - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)