Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.11->trunk
authorKim Alvefur <zash@zash.se>
Fri, 08 Nov 2019 00:58:03 +0100
changeset 10405 1ef1f6c43c5b
parent 10403 270cb2821566 (current diff)
parent 10404 4c2d789a106b (diff)
child 10406 0971694b30a8
Merge 0.11->trunk
net/resolvers/basic.lua file | annotate | diff | comparison | revisions
net/resolvers/service.lua file | annotate | diff | comparison | revisions 
--- a/net/resolvers/basic.lua	Thu Nov 07 19:23:42 2019 +0100
+++ b/net/resolvers/basic.lua	Fri Nov 08 00:58:03 2019 +0100
@@ -22,6 +22,7 @@
 	if not self.hostname then
 		-- FIXME report IDNA error
 		cb(nil);
+		return;
 	end
 
 	local targets = {};
--- a/net/resolvers/service.lua	Thu Nov 07 19:23:42 2019 +0100
+++ b/net/resolvers/service.lua	Fri Nov 08 00:58:03 2019 +0100
@@ -29,6 +29,7 @@
 	if not self.hostname then
 		-- FIXME report IDNA error
 		cb(nil);
+		return;
 	end
 
 	local targets = {};
prosody