diff options
author | Anatoliy Belsky <ab@php.net> | 2012-04-10 10:37:37 (GMT) |
---|---|---|
committer | Anatoliy Belsky <ab@php.net> | 2012-04-10 10:37:37 (GMT) |
commit | 31a3e831904b3ac9651fc0bf9528bd139d8f23d5 (patch) | |
tree | c17a027599f8ddb6ec578c106a188f5059a33682 | |
parent | 1a0c9ecaeee10b76895f6d67166187891777de8f (diff) | |
parent | 26dbc5ecb455720f49fc4ff707d88e88fafe426d (diff) | |
download | php-31a3e831904b3ac9651fc0bf9528bd139d8f23d5.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
Fixed bug #61631 mbstring mail related tests fail
Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
-rw-r--r-- | ext/date/tests/date_default_timezone_get-2.phpt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt index abf2835..f58938d 100644 --- a/ext/date/tests/date_default_timezone_get-2.phpt +++ b/ext/date/tests/date_default_timezone_get-2.phpt @@ -1,5 +1,9 @@ --TEST-- date_default_timezone_get() function [2] +--SKIPIF-- +<?php + if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows"); +?> --INI-- date.timezone= --FILE-- |