aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-10 23:10:56 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-10 23:10:56 +0100
commit765f6f8a4c7cc0e9c11a25d4b023567abd3a14b0 (patch)
tree7d106febcc951f5b332e0e59795539b7ae1bb82f /plugins
parentb47f264e2a9d27cdd0ed32e21439224c2dbefe76 (diff)
parentf0e489b59100e7894bada6a6d8ac8e69b3951aef (diff)
downloadprosody-765f6f8a4c7cc0e9c11a25d4b023567abd3a14b0.tar.gz
prosody-765f6f8a4c7cc0e9c11a25d4b023567abd3a14b0.zip
Merge with Zash
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index f3496597..2ddc9299 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -26,6 +26,8 @@ local log = module._log;
local sources = {};
+local dns_timeout = module:get_option_number("dns_timeout", 15);
+dns.settimeout(dns_timeout);
local max_dns_depth = module:get_option_number("dns_max_depth", 3);
local s2sout = {};