From 968eaf41a85439c6f13a0dffab06ed79fec87f41 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 9 Dec 2018 23:01:47 +0100 Subject: util.datetime: Make sure timezone difference is calculated correctly (fixes #1262) If the two os.date() calls happen at either side of a second ticking over there would be a one second error in the calculation. --- util/datetime.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/datetime.lua b/util/datetime.lua index 06be9fc2..2d27ece4 100644 --- a/util/datetime.lua +++ b/util/datetime.lua @@ -38,7 +38,8 @@ local function parse(s) local year, month, day, hour, min, sec, tzd; year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)%-?(%d%d)%-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-]?.*)$"); if year then - local time_offset = os_difftime(os_time(os_date("*t")), os_time(os_date("!*t"))); -- to deal with local timezone + local now = os_time(); + local time_offset = os_difftime(os_time(os_date("*t", now)), os_time(os_date("!*t", now))); -- to deal with local timezone local tzd_offset = 0; if tzd ~= "" and tzd ~= "Z" then local sign, h, m = tzd:match("([+%-])(%d%d):?(%d*)"); -- cgit v1.2.3