Software / code / prosody
Changeset
8154:6300394bb713
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 27 May 2017 16:42:50 +0200 |
| parents | 8149:1dc6efcc420a (current diff) 8152:8e26672df704 (diff) |
| children | 8156:745e0a783055 |
| files | net/dns.lua plugins/mod_watchregistrations.lua |
| diffstat | 2 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/net/dns.lua Sat May 20 14:58:56 2017 +0200 +++ b/net/dns.lua Sat May 27 16:42:50 2017 +0200 @@ -137,9 +137,7 @@ 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 @@ -506,11 +504,7 @@ 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]];
--- a/plugins/mod_watchregistrations.lua Sat May 20 14:58:56 2017 +0200 +++ b/plugins/mod_watchregistrations.lua Sat May 27 16:42:50 2017 +0200 @@ -22,7 +22,8 @@ :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;
