Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: fix test
nikic · Dec 12, 2013 · 8ee6fe9 · 8ee6fe9
2 parents da62fd5 + c59f318
commit 8ee6fe9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/ext/date/tests/bug53879.phpt b/ext/date/tests/bug53879.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
+--INI--
+date.timezone=UTC
 --FILE--
 <?php
 $date = DateTime::createFromFormat(DateTime::COOKIE, "Mon, 21-Jan-2041 15:24:52 GMT");