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
commit82c7e79cc62a89300b0ad6965abb2013de576e59 (patch)
tree4e1939ce05cf9b9eb23235b687ca390f33457eb1
parentb10435f306638c4d99a33a398c62003f27628c0e (diff)
parentf57d4a439ae2a3b013703e9091b549b7ba315d64 (diff)
downloadprosody-82c7e79cc62a89300b0ad6965abb2013de576e59.tar.gz
prosody-82c7e79cc62a89300b0ad6965abb2013de576e59.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 = {};