diff options
| author | Kim Alvefur <zash@zash.se> | 2017-06-13 16:38:53 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-06-13 16:38:53 +0200 |
| commit | 655752da9bed120b7419d575dbae0ed04916c4a3 (patch) | |
| tree | 027f373f39d309bbe3d85c2da089f0c59904e131 | |
| parent | 6fc795d35e8ca0e99828e7536099f9cd9b9b4433 (diff) | |
| parent | 146583f09ad5d4ecee4c10b9e5b6ac6ab8024bfa (diff) | |
| download | prosody-655752da9bed120b7419d575dbae0ed04916c4a3.tar.gz prosody-655752da9bed120b7419d575dbae0ed04916c4a3.zip | |
Merge 0.10->trunk
| -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]]; |