aboutsummaryrefslogtreecommitdiffstats
path: root/net/dns.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-27 16:42:50 +0200
committerKim Alvefur <zash@zash.se>2017-05-27 16:42:50 +0200
commit2de6a3c39488f2f545e4f70cd7b36addc283f34d (patch)
tree63f6c38195e6899a068269e4d7a1eb67c0382ecd /net/dns.lua
parent06b5c50c4e4751e54ca01175d2898bb88cd84819 (diff)
parentdf7d65413de0e9b9ed047dd701a400fd8873d0ec (diff)
downloadprosody-2de6a3c39488f2f545e4f70cd7b36addc283f34d.tar.gz
prosody-2de6a3c39488f2f545e4f70cd7b36addc283f34d.zip
Merge 0.9->0.10
Diffstat (limited to 'net/dns.lua')
-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]];