Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 12 Aug 2016 01:38:47 +0200
changeset 7565 bc40f6d626a0
parent 7563 785fa1138293 (current diff)
parent 7564 ab8324d3b899 (diff)
child 7566 71dc0d89a9b8
Merge 0.10->trunk
--- a/plugins/mod_s2s/s2sout.lib.lua	Fri Aug 12 01:13:26 2016 +0200
+++ b/plugins/mod_s2s/s2sout.lib.lua	Fri Aug 12 01:38:47 2016 +0200
@@ -22,6 +22,8 @@
 
 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 @@
 		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