diff options
| author | Michael Wallner <mike@php.net> | 2013-12-12 12:09:54 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-12-12 12:09:54 +0100 |
| commit | 1dfbe99ce45d3b480dcaddcd2a4c3f4fe06ea0b3 (patch) | |
| tree | caca193e8c4765dd601f47b6f6cf379f406968ca | |
| parent | 39a2dcdeac1c65076b54750435786ae1fbcf2694 (diff) | |
| parent | 8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6 (diff) | |
| download | php-git-1dfbe99ce45d3b480dcaddcd2a4c3f4fe06ea0b3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
| -rw-r--r-- | ext/date/tests/bug53879.phpt | 2 |
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"); |