# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1497364733 -7200
# Node ID e564f13b9582b251d5f3799ac2fba5f4de57d91e
# Parent  a49c8930da3d233bb4e3841a136571be3de1debd# Parent  a395957f3bf2bfca515499ff84925fc36ba60b0d
Merge 0.10->trunk

diff -r a49c8930da3d -r e564f13b9582 net/dns.lua
--- 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]];