aboutsummaryrefslogtreecommitdiffstats
path: root/util/datetime.lua
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
commit0f81719d6086ee57e06002eadfd98d8b869e41ae (patch)
treeb0da445d3726f0281f2a9b7b5ce714af4fa82561 /util/datetime.lua
parentf629de74c48447ea8850a8d104fede5c7e1b5068 (diff)
downloadprosody-0f81719d6086ee57e06002eadfd98d8b869e41ae.tar.gz
prosody-0f81719d6086ee57e06002eadfd98d8b869e41ae.zip
util.datetime: Fix timestamp parsing when in DST (thanks xnyhps)
Diffstat (limited to 'util/datetime.lua')
-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