summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-04-06 22:37:58 +0000
committerfoobar <sniper@php.net>2003-04-06 22:37:58 +0000
commit2527cce05222c891bc6e945e3d25f33142bf3197 (patch)
tree891441a5f5dd11dde51c7e2e45c1bd886216c221 /ext
parent18939dd6767e7e69c9a14ea99b3526aa7ff523b5 (diff)
downloadphp-git-2527cce05222c891bc6e945e3d25f33142bf3197.tar.gz
MFH: Fixed bug #23071 (when DST in effect, date("T") crashed PHP)
Diffstat (limited to 'ext')
-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 3f9546b76e..71d8aeb353 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -540,7 +540,7 @@ 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 */