From eb8bccee56c3692c8cd03d6c6aeaf93633d565f7 Mon Sep 17 00:00:00 2001
From: Kai Schroeder <k.schroeder@php.net>
Date: Sun, 9 Feb 2003 21:44:51 +0000
Subject: [PATCH] fix for #17928

---
 ext/standard/datetime.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 39a7e4c96b5..3f9546b76ef 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 */