aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-27 17:30:16 +0200
committerKim Alvefur <zash@zash.se>2017-05-27 17:30:16 +0200
commitcdbc10d329038d2140f14a48f466dbc5c74a0d58 (patch)
tree4dab1a814ae981f0867ccc14b15f299e6dad5d4e /net
parent4941d65177e7ebd1ac888d86ec4cd8e734ab79d5 (diff)
parent51c54db4d69978ddc4371117a2c8143101af4696 (diff)
downloadprosody-im-server-cdbc10d329038d2140f14a48f466dbc5c74a0d58.tar
prosody-im-server-cdbc10d329038d2140f14a48f466dbc5c74a0d58.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/dns.lua10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 232e9e7c..20f85462 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
@@ -506,11 +504,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]];