mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2017-05-27 16:42:50 +02:00
commit 2de6a3c394
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/dns.lua
View file

@ -137,9 +137,7 @@ local function prune(rrs, time, soft) -- - - - - - - - - - - - - - - prune
time = time or socket.gettime(); time = time or socket.gettime();
for i,rr in ipairs(rrs) do for i,rr in ipairs(rrs) do
if rr.tod then if rr.tod then
-- rr.tod = rr.tod - 50 -- accelerated decripitude if rr.tod < time then
rr.ttl = math.floor(rr.tod - time);
if rr.ttl <= 0 then
rrs[rr[rr.type:lower()]] = nil; rrs[rr[rr.type:lower()]] = nil;
table.remove(rrs, i); table.remove(rrs, i);
return prune(rrs, time, soft); -- Re-iterate return prune(rrs, time, soft); -- Re-iterate
@ -506,11 +504,7 @@ function resolver:rr() -- - - - - - - - - - - - - - - - - - - - - - - - rr
rr.ttl = 0x10000*self:word() + self:word(); rr.ttl = 0x10000*self:word() + self:word();
rr.rdlength = self:word(); rr.rdlength = self:word();
if rr.ttl <= 0 then
rr.tod = self.time + 30;
else
rr.tod = self.time + rr.ttl; rr.tod = self.time + rr.ttl;
end
local remember = self.offset; local remember = self.offset;
local rr_parser = self[dns.type[rr.type]]; local rr_parser = self[dns.type[rr.type]];

3
plugins/mod_watchregistrations.lua
View file

@ -22,7 +22,8 @@ module:hook("user-registered", function (user)
:tag("body") :tag("body")
:text(registration_notification:gsub("%$(%w+)", function (v) :text(registration_notification:gsub("%$(%w+)", function (v)
return user[v] or user.session and user.session[v] or nil; return user[v] or user.session and user.session[v] or nil;
end)); end))
:up();
for jid in registration_watchers do for jid in registration_watchers do
module:log("debug", "Notifying %s", jid); module:log("debug", "Notifying %s", jid);
message.attr.to = jid; message.attr.to = jid;