Merge branch 'PHP-5.4'

* PHP-5.4: 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 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 MFH: fixed a mistake on reverting my previous patch.
tychay · Apr 10, 2012 · e33d209 · e33d209
2 parents 58aa160 + 31a3e83
commit e33d209
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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--