diff options
| author | Kai Schroeder <k.schroeder@php.net> | 2003-02-09 21:44:51 +0000 |
|---|---|---|
| committer | Kai Schroeder <k.schroeder@php.net> | 2003-02-09 21:44:51 +0000 |
| commit | eb8bccee56c3692c8cd03d6c6aeaf93633d565f7 (patch) | |
| tree | de792548c3868f5a274fd862f63c85a1508a44b4 | |
| parent | 03e22793ffff5bdd404b341d71222a2e2b787b01 (diff) | |
| download | php-git-eb8bccee56c3692c8cd03d6c6aeaf93633d565f7.tar.gz | |
fix for #17928
| -rw-r--r-- | ext/standard/datetime.c | 6 |
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 */ |