From: Kai Schroeder <k.schroeder@php.net>
Date: Sun, 9 Feb 2003 21:42:31 +0000 (+0000)
Subject: fix for #17928
X-Git-Tag: php-4.3.2RC1~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77e3df17cca40d1de8851562c3b502679b5a0cb3;p=php

fix for #17928
---

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 39a7e4c96b..3f9546b76e 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -343,7 +343,11 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 #if HAVE_TM_ZONE
 				size += strlen(ta->tm_zone);
 #elif HAVE_TZNAME
-				size += strlen(tname[0]);
+				if (ta->tm_isdst > 0 ) {
+					size += strlen(tname[1]);
+				} else {
+					size += strlen(tname[0]);
+				}
 #endif
 				break;
 			case 'Z':		/* timezone offset in seconds */