Software /
code /
prosody
Diff
plugins/mod_s2s/s2sout.lib.lua @ 8902:ac21f13798ae
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 09 Jun 2018 15:47:59 +0200 |
parent | 8896:739deb514140 |
parent | 8899:c72a6226ee31 |
child | 8910:28ec1e024379 |
line wrap: on
line diff
--- a/plugins/mod_s2s/s2sout.lib.lua Sun Jun 03 00:57:51 2018 +0200 +++ b/plugins/mod_s2s/s2sout.lib.lua Sat Jun 09 15:47:59 2018 +0200 @@ -30,7 +30,6 @@ 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 @@ 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);