Fixed bug #23071 (when DST in effect, date("T") crashed PHP)

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 0c8376ad77f77e15568b5f1117c5e9c8689ba898..cc1178f06a28ff41b2e34ffa160204eaeb2986e4 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -535,7 +535,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
 #if HAVE_TM_ZONE
                                strcat(Z_STRVAL_P(return_value), ta->tm_zone);
 #elif HAVE_TZNAME
-                               strcat(Z_STRVAL_P(return_value), tname[0]);
+                               strcat(Z_STRVAL_P(return_value), ta->tm_isdst ? tname[1] : tname[0]);
 #endif
                                break;
                        case 'B':       /* Swatch Beat a.k.a. Internet Time */