From: Melvyn Sopacua <msopacua@php.net>
Date: Tue, 9 Sep 2003 21:56:33 +0000 (+0000)
Subject: MFB: Fix US/Eastern vs. America/New_York style tzset implementations.
X-Git-Tag: RELEASE_0_7~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50947cb1554bb88e49370e64f66dafad06d19461;p=php

MFB: Fix US/Eastern vs. America/New_York style tzset implementations.
---

diff --git a/ext/standard/tests/time/002.phpt b/ext/standard/tests/time/002.phpt
index 5156842583..ed1b0f1370 100644
--- a/ext/standard/tests/time/002.phpt
+++ b/ext/standard/tests/time/002.phpt
@@ -33,12 +33,12 @@ if (!@putenv("TZ=EST5") || getenv("TZ") != 'EST5') {
 	    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));
 	}
diff --git a/ext/standard/tests/time/bug13142.phpt b/ext/standard/tests/time/bug13142.phpt
index f021bea6aa..af3e1f2f31 100644
--- a/ext/standard/tests/time/bug13142.phpt
+++ b/ext/standard/tests/time/bug13142.phpt
@@ -9,6 +9,9 @@ if (!@putenv("TZ=US/Eastern") || getenv("TZ") != 'US/Eastern') {
 --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"));	
 ?>