summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-12-12 16:46:49 +0400
committerDmitry Stogov <dmitry@zend.com>2013-12-12 16:46:49 +0400
commit711d8c2c7b033ccc63db98b762136218786c2f22 (patch)
treed4c427538574e60ecce95ab82e137806246f3e5c
parent47f41385e1cad7cf2d4b78163004407689e0a8e7 (diff)
parent8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6 (diff)
downloadphp-git-711d8c2c7b033ccc63db98b762136218786c2f22.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: 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");