summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2013-12-12 12:09:34 +0100
committerMichael Wallner <mike@php.net>2013-12-12 12:09:34 +0100
commit8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6 (patch)
treea1c506716205fb1f695804358bcfb9e212e23e45
parentda62fd5ed824bafc4dc3e90278c3d57d8e74cbe1 (diff)
parentc59f3184a31c0e82d68c5823534e19aef78d9bf1 (diff)
downloadphp-git-8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix test
-rw-r--r--ext/date/tests/bug53879.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/date/tests/bug53879.phpt b/ext/date/tests/bug53879.phpt
index 64c0f18fef..3d16c97209 100644
--- 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");