summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/standard/datetime.c6
1 files changed, 5 insertions, 1 deletions
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 */