# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1497364732 -7200
# Node ID a395957f3bf2bfca515499ff84925fc36ba60b0d
# Parent  31938a0c398f6d9971de273e595ad62928194e5a# Parent  a55eb6c3b45c196ee8df7bed941b0ff2fdfb4815
Merge 0.9->0.10

diff -r 31938a0c398f -r a395957f3bf2 net/dns.lua
--- a/net/dns.lua	Thu Jun 01 14:05:43 2017 +0200
+++ b/net/dns.lua	Tue Jun 13 16:38:52 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]];