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 | 146583f09ad5d4ecee4c10b9e5b6ac6ab8024bfa (patch) | |
| tree | a8cf8d05df7c71ffeafe67bc1d3e6bf1ad21a5c1 /net | |
| parent | aa3eb08cef920e003252cca86120323e14111b52 (diff) | |
| parent | d3fafd4a697ba5d8f1d6a00f81edce52931635f5 (diff) | |
| download | prosody-146583f09ad5d4ecee4c10b9e5b6ac6ab8024bfa.tar.gz prosody-146583f09ad5d4ecee4c10b9e5b6ac6ab8024bfa.zip | |
Merge 0.9->0.10
Diffstat (limited to 'net')
| -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]]; |