# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1573171083 -3600
# Node ID 1ef1f6c43c5bcf839226b91b1dcb68553790c4a9
# Parent  270cb282156628ecad570a07daf8897c0e146b46# Parent  4c2d789a106b102daf1499b3ff90e48b9dbaf7aa
Merge 0.11->trunk

diff -r 270cb2821566 -r 1ef1f6c43c5b net/resolvers/basic.lua
--- 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 = {};
diff -r 270cb2821566 -r 1ef1f6c43c5b net/resolvers/service.lua
--- 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 = {};