diff options
| author | Kim Alvefur <zash@zash.se> | 2017-06-13 16:38:52 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-06-13 16:38:52 +0200 |
| commit | 9e04351ec4952f458374d6d0de2975baed8ab41c (patch) | |
| tree | a8cf8d05df7c71ffeafe67bc1d3e6bf1ad21a5c1 | |
| parent | 3c37921b044842e3c1e73cea3ac9be6bbcf997ed (diff) | |
| parent | 1bc7fc65876926467363f8436a9edb65a8d59f5d (diff) | |
| download | prosody-9e04351ec4952f458374d6d0de2975baed8ab41c.tar.gz prosody-9e04351ec4952f458374d6d0de2975baed8ab41c.zip | |
Merge 0.9->0.10
| -rw-r--r-- | net/dns.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns.lua b/net/dns.lua index 20f85462..188bdf43 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 + rr.ttl; + rr.tod = self.time + math.min(rr.ttl, 1); local remember = self.offset; local rr_parser = self[dns.type[rr.type]]; |