From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 2 Aug 2009 23:12:04 +0000 (+0000)
Subject: Missed a merge
X-Git-Tag: php-5.4.0alpha1~191^2~2883
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f607e0017553b2f8b01baab81df91426d73c051;p=php

Missed a merge
---

diff --git a/ext/date/tests/bug48058.phpt b/ext/date/tests/bug48058.phpt
index 27a3e90a62..5009c9f245 100644
--- a/ext/date/tests/bug48058.phpt
+++ b/ext/date/tests/bug48058.phpt
@@ -13,12 +13,12 @@ $base_time = '28 Feb 2008 12:00:00';
 $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"]=>
diff --git a/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
index 8cf54b732a..fd01d83ca1 100755
--- a/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
@@ -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));