diff options
| author | Kim Alvefur <zash@zash.se> | 2018-06-09 15:47:59 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-06-09 15:47:59 +0200 |
| commit | 10dd45398909d8a2f5081f9501c26460f738d388 (patch) | |
| tree | 2012e72c749814da4062b2a5dd0ff6b7725f5aa9 /plugins/mod_s2s | |
| parent | d74f8ee65dc4b5bcb3716f1f3039e8017ef774a3 (diff) | |
| parent | 5ae35f54cc69163c9d0c0f3e9bb40b07542af9c0 (diff) | |
| download | prosody-10dd45398909d8a2f5081f9501c26460f738d388.tar.gz prosody-10dd45398909d8a2f5081f9501c26460f738d388.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index a13eb8c9..038d84a5 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 resolvers = module:get_option_set("s2s_dns_resolvers") local s2sout = {}; @@ -51,6 +50,7 @@ function s2sout.initiate_connection(host_session) host_session.version = 1; host_session.resolver = adns.resolver(); + host_session.resolver._resolver:settimeout(dns_timeout); if resolvers then for resolver in resolvers do host_session.resolver._resolver:addnameserver(resolver); |