aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-09 00:09:25 +0200
committerKim Alvefur <zash@zash.se>2018-06-09 00:09:25 +0200
commitd8100c6004f4de2bef68e8fdafaf2b617658cda4 (patch)
treef206e03d57f1b5fc673d251da07e4ba5eb3c42f7
parent73a7fa134dbd699120920d1f65b3224fc6aa5e5e (diff)
downloadprosody-d8100c6004f4de2bef68e8fdafaf2b617658cda4.tar.gz
prosody-d8100c6004f4de2bef68e8fdafaf2b617658cda4.zip
mod_s2s: Fix DNS timeout setting for per-session resolvers (fixes #1167)
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index cd8553e1..122ab6a9 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -30,7 +30,6 @@ local sources = {};
local has_ipv4, has_ipv6;
local dns_timeout = module:get_option_number("dns_timeout", 15);
-dns.settimeout(dns_timeout);
local s2sout = {};
@@ -50,6 +49,7 @@ function s2sout.initiate_connection(host_session)
host_session.version = 1;
host_session.resolver = adns.resolver();
+ host_session.resolver._resolver:settimeout(dns_timeout);
-- Kick the connection attempting machine into life
if not s2sout.attempt_connection(host_session) then