aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-24 22:48:12 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-24 22:48:12 +0000
commit44fe79faff36d674623e2189f37a4e8512bc207d (patch)
tree34d50fb56d199fd5c8f68a57b9e13c1eaea024a9 /net
parent3487bfbd547efbdb6021f24b517c15ba08ee84db (diff)
parentef00aa87e4adb5fbe1779e5cf67bed272d02589e (diff)
downloadprosody-44fe79faff36d674623e2189f37a4e8512bc207d.tar.gz
prosody-44fe79faff36d674623e2189f37a4e8512bc207d.zip
Merge 0.7->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index b767cb20..15fe4b3b 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -21,12 +21,12 @@ local LAST_MODIFIED = "2009/11/20"
local cfg = {
MAX_CONNECTIONS = 100000, -- max per server connections (use "ulimit -n" on *nix)
MAX_HANDSHAKE_ATTEMPS = 1000, -- attemps to finish ssl handshake
- HANDSHAKE_TIMEOUT = 30, -- timout in seconds per handshake attemp
+ HANDSHAKE_TIMEOUT = 60, -- timout in seconds per handshake attemp
MAX_READ_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes allowed to read from sockets
MAX_SEND_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes size of write buffer (for writing on sockets)
ACCEPT_DELAY = 10, -- seconds to wait until the next attemp of a full server to accept
- READ_TIMEOUT = 60 * 30, -- timeout in seconds for read data from socket
- WRITE_TIMEOUT = 30, -- timeout in seconds for write data on socket
+ READ_TIMEOUT = 60 * 60 * 6, -- timeout in seconds for read data from socket
+ WRITE_TIMEOUT = 180, -- timeout in seconds for write data on socket
CONNECT_TIMEOUT = 20, -- timeout in seconds for connection attemps
CLEAR_DELAY = 5, -- seconds to wait for clearing interface list (and calling ondisconnect listeners)
DEBUG = true, -- show debug messages