aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-11-08 00:58:03 +0100
committerKim Alvefur <zash@zash.se>2019-11-08 00:58:03 +0100
commit03197f584d7da03d113d91375b303823f0abadce (patch)
tree4e1939ce05cf9b9eb23235b687ca390f33457eb1
parentc63beda273f7180dcf4cff13db3921840818d2c6 (diff)
parent2a8b031b7519801a5eae330bcdf48bbbd742621c (diff)
downloadprosody-03197f584d7da03d113d91375b303823f0abadce.tar.gz
prosody-03197f584d7da03d113d91375b303823f0abadce.zip
Merge 0.11->trunk
-rw-r--r--net/resolvers/basic.lua1
-rw-r--r--net/resolvers/service.lua1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/resolvers/basic.lua b/net/resolvers/basic.lua
index 7f25a894..2499178a 100644
--- a/net/resolvers/basic.lua
+++ b/net/resolvers/basic.lua
@@ -22,6 +22,7 @@ function methods:next(cb)
if not self.hostname then
-- FIXME report IDNA error
cb(nil);
+ return;
end
local targets = {};
diff --git a/net/resolvers/service.lua b/net/resolvers/service.lua
index f9a30f91..65b086d2 100644
--- a/net/resolvers/service.lua
+++ b/net/resolvers/service.lua
@@ -29,6 +29,7 @@ function methods:next(cb)
if not self.hostname then
-- FIXME report IDNA error
cb(nil);
+ return;
end
local targets = {};