aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-04-15 22:39:53 +0100
committerMatthew Wild <mwild1@gmail.com>2011-04-15 22:39:53 +0100
commit4ff48cecfd6ae3a630f92bd0b2bcc6a89c8408c8 (patch)
tree57bdd1b3d7cd031474e633ea001cd166d8891be5 /util
parent0257b8e30ca007b2387bbd76acaff293d66e055a (diff)
downloadprosody-4ff48cecfd6ae3a630f92bd0b2bcc6a89c8408c8.tar.gz
prosody-4ff48cecfd6ae3a630f92bd0b2bcc6a89c8408c8.zip
util.datetime: Fix timestamp parsing when in DST (thanks xnyhps)
Diffstat (limited to 'util')
-rw-r--r--util/datetime.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/datetime.lua b/util/datetime.lua
index 301a49a5..c73d8e76 100644
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -49,7 +49,7 @@ function parse(s)
if sign == "-" then tzd_offset = -tzd_offset; end
end
sec = (sec + time_offset) - tzd_offset;
- return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec});
+ return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec, isdst=false});
end
end
end