fix for #17928

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 39a7e4c96b5f22441193d82d35e234dc3e3b21c2..3f9546b76efda4adaf80c803eac31d9d9077fd08 100644 (file)
--- 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 */