Comparison

plugins/mod_c2s.lua @ 8390:4c629fde768c

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 Nov 2017 17:47:50 +0100
parent 8235:7d9a2c200736
parent 8388:9ee56e9ad47a
child 8764:81d305bbe7bc
comparison
equal deleted inserted replaced
8389:5d866eb8f18f 8390:4c629fde768c
21 21
22 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams"; 22 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
23 23
24 local log = module._log; 24 local log = module._log;
25 25
26 local c2s_timeout = module:get_option_number("c2s_timeout"); 26 local c2s_timeout = module:get_option_number("c2s_timeout", 300);
27 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5); 27 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
28 local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true)); 28 local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
29 29
30 local measure_connections = module:measure("connections", "amount"); 30 local measure_connections = module:measure("connections", "amount");
31 31