aboutsummaryrefslogtreecommitdiffstats
path: root/net/dns.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-06-13 16:36:47 +0200
committerKim Alvefur <zash@zash.se>2017-06-13 16:36:47 +0200
commitaf87a0a196774b3bf6b7dccf0b82069a4ae04d3d (patch)
tree59e70424f0024537ff1bf358520a87ef28f04af4 /net/dns.lua
parent607db2c49605096528c4937a0576d745d78acc64 (diff)
downloadprosody-af87a0a196774b3bf6b7dccf0b82069a4ae04d3d.tar.gz
prosody-af87a0a196774b3bf6b7dccf0b82069a4ae04d3d.zip
net.dns: Prevent answers from immediately expiring even if TTL=0 (see #919)
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 5e29e906..0d6a828c 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -513,7 +513,7 @@ function resolver:rr() -- - - - - - - - - - - - - - - - - - - - - - - - rr
rr.ttl = 0x10000*self:word() + self:word();
rr.rdlength = self:word();
- rr.tod = self.time + rr.ttl;
+ rr.tod = self.time + math.min(rr.ttl, 1);
local remember = self.offset;
local rr_parser = self[dns.type[rr.type]];