prosody
6300394bb713
net/dns.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/dns.lua @ 8154:6300394bb713

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sat, 27 May 2017 16:42:50 +0200
parent 7527:936b78e9f399
parent 8151:2c65f8be38aa
child 8164:a395957f3bf2
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]];