# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1495896170 -7200
# Node ID 6300394bb7138b89a9f5a19c242cff58906844a8
# Parent  1dc6efcc420a2b5ebeaee41acd0016e3a7085aee# Parent  8e26672df704269911cc806a9571d53b5e9fcbcb
Merge 0.9->0.10

diff -r 1dc6efcc420a -r 6300394bb713 net/dns.lua
--- a/net/dns.lua	Sat May 20 14:58:56 2017 +0200
+++ b/net/dns.lua	Sat May 27 16:42:50 2017 +0200
@@ -137,9 +137,7 @@
 	time = time or socket.gettime();
 	for i,rr in ipairs(rrs) do
 		if rr.tod then
-			-- rr.tod = rr.tod - 50    -- accelerated decripitude
-			rr.ttl = math.floor(rr.tod - time);
-			if rr.ttl <= 0 then
+			if rr.tod < time then
 				rrs[rr[rr.type:lower()]] = nil;
 				table.remove(rrs, i);
 				return prune(rrs, time, soft); -- Re-iterate
@@ -506,11 +504,7 @@
 	rr.ttl      = 0x10000*self:word() + self:word();
 	rr.rdlength = self:word();
 
-	if rr.ttl <= 0 then
-		rr.tod = self.time + 30;
-	else
-		rr.tod = self.time + rr.ttl;
-	end
+	rr.tod = self.time + rr.ttl;
 
 	local remember = self.offset;
 	local rr_parser = self[dns.type[rr.type]];
diff -r 1dc6efcc420a -r 6300394bb713 plugins/mod_watchregistrations.lua
--- a/plugins/mod_watchregistrations.lua	Sat May 20 14:58:56 2017 +0200
+++ b/plugins/mod_watchregistrations.lua	Sat May 27 16:42:50 2017 +0200
@@ -22,7 +22,8 @@
 		:tag("body")
 			:text(registration_notification:gsub("%$(%w+)", function (v)
 				return user[v] or user.session and user.session[v] or nil;
-			end));
+			end))
+		:up();
 	for jid in registration_watchers do
 		module:log("debug", "Notifying %s", jid);
 		message.attr.to = jid;