# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1510332470 -3600
# Node ID 4c629fde768cb8304c97542c3304da3a1400e725
# Parent  5d866eb8f18fe4d7e63c22d80187375b8bd621e1# Parent  9ee56e9ad47ac3de82885edc3c866d99f96fe627
Merge 0.10->trunk

diff -r 5d866eb8f18f -r 4c629fde768c plugins/mod_c2s.lua
--- a/plugins/mod_c2s.lua	Fri Nov 10 17:47:11 2017 +0100
+++ b/plugins/mod_c2s.lua	Fri Nov 10 17:47:50 2017 +0100
@@ -23,7 +23,7 @@
 
 local log = module._log;
 
-local c2s_timeout = module:get_option_number("c2s_timeout");
+local c2s_timeout = module:get_option_number("c2s_timeout", 300);
 local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
 local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));