Merge 0.9->0.10

This commit is contained in:
Kim Alvefur 2017-06-13 16:38:52 +02:00
commit 146583f09a

View file

@ -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]];