msopacua Tue Sep 9 17:56:34 2003 EDT
Modified files:
/php-src/ext/standard/tests/time 002.phpt bug13142.phpt
Log:
MFB: Fix US/Eastern vs. America/New_York style tzset implementations.
Index: php-src/ext/standard/tests/time/002.phpt
diff -u php-src/ext/standard/tests/time/002.phpt:1.10
php-src/ext/standard/tests/time/002.phpt:1.11
--- php-src/ext/standard/tests/time/002.phpt:1.10 Thu Aug 7 13:46:18 2003
+++ php-src/ext/standard/tests/time/002.phpt Tue Sep 9 17:56:33 2003
@@ -33,12 +33,12 @@
echo date ("Y-m-d H:i:s\n", strtotime ($date));
}
- if (PHP_OS === "OSF1") {
+ putenv("TZ=US/Eastern");
+ if( date("T") == "GMT" ) {
// POSIX style
putenv ("TZ=EST5EDT4,M4.1.0,M10.5.0");
- } else {
- putenv ("TZ=US/Eastern");
}
+
foreach ($dates as $date) {
echo date ("Y-m-d H:i:s\n", strtotime ($date));
}
Index: php-src/ext/standard/tests/time/bug13142.phpt
diff -u php-src/ext/standard/tests/time/bug13142.phpt:1.2
php-src/ext/standard/tests/time/bug13142.phpt:1.3
--- php-src/ext/standard/tests/time/bug13142.phpt:1.2 Tue Aug 5 08:29:26 2003
+++ php-src/ext/standard/tests/time/bug13142.phpt Tue Sep 9 17:56:33 2003
@@ -9,6 +9,9 @@
--FILE--
<?php
putenv("TZ=US/Eastern");
+if (date('T') == 'GMT') {
+ putenv("TZ=EST5EDT4,M4.1.0,M10.5.0");
+}
echo date("r\n", strtotime("Sep 04 16:39:45 2001"));
echo date("r\n", strtotime("Sep 04 2001 16:39:45"));
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
