diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-12 01:38:47 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-12 01:38:47 +0200 |
commit | 421ef192cadda2c474419071ab8560cdf7de51c4 (patch) | |
tree | 3bba5532ac1efa1c38656bc97d43cda718604029 | |
parent | fd025274c6f71d82cd2494f6c2deadf134f8d45e (diff) | |
parent | ef3f3b099fd0e7b0a7ac2705523ad719ce8a0a33 (diff) | |
download | prosody-421ef192cadda2c474419071ab8560cdf7de51c4.tar.gz prosody-421ef192cadda2c474419071ab8560cdf7de51c4.zip |
Merge 0.10->trunk
-rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 42413164..1038a616 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -22,6 +22,8 @@ local local_addresses = require "util.net".local_addresses; local s2s_destroy_session = require "core.s2smanager".destroy_session; +local default_mode = module:get_option("network_default_read_size", 4096); + local log = module._log; local sources = {}; @@ -282,7 +284,7 @@ function s2sout.make_connect(host_session, connect_host, connect_port) return false, err; end - conn = wrapclient(conn, connect_host.addr, connect_port, s2s_listener, "*a"); + conn = wrapclient(conn, connect_host.addr, connect_port, s2s_listener, default_mode); host_session.conn = conn; -- Register this outgoing connection so that xmppserver_listener knows about it |