From b9c97d72a87bc608737b9af2556836f8c676622c Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Wed, 16 Jul 2008 15:40:01 +0000 Subject: [PATCH] - Fixed bug #45529 (new DateTimeZone() and date_create()->getTimezone() behave different). --- ext/date/lib/parse_date.c | 4 ++-- ext/date/lib/parse_date.re | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index b03c53bac3..daa256a10f 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Tue Jul 15 19:35:53 2008 */ +/* Generated by re2c 0.13.5 on Wed Jul 16 17:39:20 2008 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -800,7 +800,7 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_ } #endif /* If we have a TimeZone identifier to start with, use it */ - if (strstr(tz_abbr, "/")) { + if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { t->tz_info = res; t->zone_type = TIMELIB_ZONETYPE_ID; diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 14bd7e88db..2a66d51461 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -798,7 +798,7 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_ } #endif /* If we have a TimeZone identifier to start with, use it */ - if (strstr(tz_abbr, "/")) { + if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { t->tz_info = res; t->zone_type = TIMELIB_ZONETYPE_ID; -- 2.40.0