aboutsummaryrefslogtreecommitdiffstats
path: root/net/dns.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-09-26 17:24:25 +0100
committerMatthew Wild <mwild1@gmail.com>2017-09-26 17:24:25 +0100
commitd6833915bcfaeb6600c0af911102a8362e26e93e (patch)
tree575fdc7082baf42f3c7871cac1bc03d7fa65f905 /net/dns.lua
parent43e5d4df2985e069c52fb21e4636e3e44053d1bf (diff)
parent86ee041be81ad313a24c87b6e38f92fe4400cf17 (diff)
downloadprosody-d6833915bcfaeb6600c0af911102a8362e26e93e.tar.gz
prosody-d6833915bcfaeb6600c0af911102a8362e26e93e.zip
Merge 0.10->trunk
Diffstat (limited to 'net/dns.lua')
-rw-r--r--net/dns.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 188bdf43..5ba3db0e 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -504,7 +504,7 @@ function resolver:rr() -- - - - - - - - - - - - - - - - - - - - - - - - rr
rr.ttl = 0x10000*self:word() + self:word();
rr.rdlength = self:word();
- rr.tod = self.time + math.min(rr.ttl, 1);
+ rr.tod = self.time + math.max(rr.ttl, 1);
local remember = self.offset;
local rr_parser = self[dns.type[rr.type]];