summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-04-06 22:37:45 +0000
committerfoobar <sniper@php.net>2003-04-06 22:37:45 +0000
commitc3e90bd6ed94c4db4442bc485d75267ecae4eb76 (patch)
tree5147129c0d84b854fe2d801d2562ea011691169d
parentcfbf35a5f23a55315c2bd6a9ab44f73a7465267c (diff)
downloadphp-git-c3e90bd6ed94c4db4442bc485d75267ecae4eb76.tar.gz
Fixed bug #23071 (when DST in effect, date("T") crashed PHP)
-rw-r--r--ext/standard/datetime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 0c8376ad77..cc1178f06a 100644
--- 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 */