From e326d6852abfea384e0f4d4827bcc93d0041cc66 Mon Sep 17 00:00:00 2001 From: Debian PHP Maintainers Date: Sat, 2 May 2015 10:26:56 +0200 Subject: [PATCH] Use system timezone Upstream don't want this patch. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730771 for a summary. This delta is recovered from previous versions of the system timezone patch in Debian, and appears to have inadvertently been dropped. Author unknown. To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezonedb_fixes.patch. Gbp-Pq: Name 0020-Use-system-timezone.patch --- ext/date/php_date.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 94ffd974..172e2f03 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -566,6 +566,23 @@ static const char* guess_timezone(const timelib_tzdb *tzdb) } else if (*DATEG(default_timezone)) { return DATEG(default_timezone); } + /* Try to guess timezone from system information */ + { + struct tm *ta, tmbuf; + time_t the_time; + char *tzid = NULL; + + the_time = time(NULL); + ta = php_localtime_r(&the_time, &tmbuf); + if (ta) { + tzid = timelib_timezone_id_from_abbr(ta->tm_zone, ta->tm_gmtoff, ta->tm_isdst); + } + if (! tzid) { + tzid = "UTC"; + } + + return tzid; + } /* Fallback to UTC */ return "UTC"; } -- 2.30.2