rasmus Sun, 02 Aug 2009 23:12:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286709
Log: Missed a merge Changed paths: U php/php-src/branches/PHP_5_2/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt U php/php-src/trunk/ext/date/tests/bug48058.phpt U php/php-src/trunk/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt Modified: php/php-src/branches/PHP_5_2/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt 2009-08-02 23:08:21 UTC (rev 286708) +++ php/php-src/branches/PHP_5_2/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt 2009-08-02 23:12:04 UTC (rev 286709) @@ -2,6 +2,8 @@ ob_iconv_handler() charset parameter length checks (CVE-2007-4840) --SKIPIF-- <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> +--INI-- +memory_limit=256M --FILE-- <?php ini_set("iconv.output_encoding", str_repeat("a", 9000000)); Modified: php/php-src/trunk/ext/date/tests/bug48058.phpt =================================================================== --- php/php-src/trunk/ext/date/tests/bug48058.phpt 2009-08-02 23:08:21 UTC (rev 286708) +++ php/php-src/trunk/ext/date/tests/bug48058.phpt 2009-08-02 23:12:04 UTC (rev 286709) @@ -13,12 +13,12 @@ $dt = date_create( "$base_time +10000000000 years" ); echo date_format( $dt, DATE_ISO8601 ); ?> ---EXPECT-- +--EXPECTF-- array(5) { [u"ts"]=> - int(-9223372036854775808) + int(-%d) [u"time"]=> - unicode(33) "-292277022657-01-27T08:29:52+0000" + unicode(%d) "%s" [u"offset"]=> int(3600) [u"isdst"]=> Modified: php/php-src/trunk/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt =================================================================== --- php/php-src/trunk/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt 2009-08-02 23:08:21 UTC (rev 286708) +++ php/php-src/trunk/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt 2009-08-02 23:12:04 UTC (rev 286709) @@ -2,6 +2,8 @@ ob_iconv_handler() charset parameter length checks (CVE-2007-4840) --SKIPIF-- <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> +--INI-- +memory_limit=256M --FILE-- <?php ini_set("iconv.output_encoding", str_repeat("a", 9000000));
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php