Software / code / prosody
Changeset
8165:e564f13b9582
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 13 Jun 2017 16:38:53 +0200 |
| parents | 8162:a49c8930da3d (current diff) 8164:a395957f3bf2 (diff) |
| children | 8168:45be94611593 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/dns.lua Thu Jun 01 14:05:58 2017 +0200 +++ b/net/dns.lua Tue Jun 13 16:38:53 2017 +0200 @@ -504,7 +504,7 @@ 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]];
