diff options
| author | Kim Alvefur <zash@zash.se> | 2013-07-24 21:50:38 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-07-24 21:50:38 +0200 |
| commit | 0f421f9b7ccbe92fb2bc50c3e576550866fbcea9 (patch) | |
| tree | c0aecb236310c4962c4623ca3ce901dd2238f3d3 /plugins/mod_c2s.lua | |
| parent | 935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab (diff) | |
| parent | 14d72bec0f68fde660609ff40be1e9d86c543598 (diff) | |
| download | prosody-0f421f9b7ccbe92fb2bc50c3e576550866fbcea9.tar.gz prosody-0f421f9b7ccbe92fb2bc50c3e576550866fbcea9.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_c2s.lua')
| -rw-r--r-- | plugins/mod_c2s.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua index d667e781..3eb9e975 100644 --- a/plugins/mod_c2s.lua +++ b/plugins/mod_c2s.lua @@ -25,7 +25,7 @@ local log = module._log; local c2s_timeout = module:get_option_number("c2s_timeout"); local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5); -local opt_keepalives = module:get_option_boolean("tcp_keepalives", false); +local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true)); local sessions = module:shared("sessions"); local core_process_stanza = prosody.core_process_stanza; |