From 1b616a9320715ba9c4796774ea8e63c76211ea8b Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 22 May 2017 05:32:11 +0200 Subject: net.dns: Simplify expiry calculation (fixes #919) --- net/dns.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/net/dns.lua b/net/dns.lua index d123731c..5e29e906 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -137,9 +137,7 @@ local function prune(rrs, time, soft) -- - - - - - - - - - - - - - - prune time = time or socket.gettime(); for i,rr in ipairs(rrs) do if rr.tod then - -- rr.tod = rr.tod - 50 -- accelerated decripitude - rr.ttl = math.floor(rr.tod - time); - if rr.ttl <= 0 then + if rr.tod < time then rrs[rr[rr.type:lower()]] = nil; table.remove(rrs, i); return prune(rrs, time, soft); -- Re-iterate @@ -515,11 +513,7 @@ function resolver:rr() -- - - - - - - - - - - - - - - - - - - - - - - - rr rr.ttl = 0x10000*self:word() + self:word(); rr.rdlength = self:word(); - if rr.ttl <= 0 then - rr.tod = self.time + 30; - else - rr.tod = self.time + rr.ttl; - end + rr.tod = self.time + rr.ttl; local remember = self.offset; local rr_parser = self[dns.type[rr.type]]; -- cgit v1.2.3 From df7d65413de0e9b9ed047dd701a400fd8873d0ec Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 27 May 2017 14:23:43 +0100 Subject: mod_watchregistrations: Return the pointer to the root of the stanza, fixes #922. --- plugins/mod_watchregistrations.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua index abca90bd..0e9d2fca 100644 --- a/plugins/mod_watchregistrations.lua +++ b/plugins/mod_watchregistrations.lua @@ -21,7 +21,8 @@ module:hook("user-registered", function (user) :tag("body") :text(registration_notification:gsub("%$(%w+)", function (v) return user[v] or user.session and user.session[v] or nil; - end)); + end)) + :up(); for jid in registration_watchers do module:log("debug", "Notifying %s", jid); message.attr.to = jid; -- cgit v1.2.3