aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-30 19:46:53 +0100
committerMatthew Wild <mwild1@gmail.com>2010-03-30 19:46:53 +0100
commit3dbf4c9e57cec2baa98f8864263a3cd11d608707 (patch)
tree8fab56c4272fd935c3e43ba0608e87e019b08bf5
parentef919e14178f9526cc9c10842c8db7359055a680 (diff)
parent13c9d77ff45c8c4fed0bef6dac77d71e9b964b88 (diff)
downloadprosody-3dbf4c9e57cec2baa98f8864263a3cd11d608707.tar.gz
prosody-3dbf4c9e57cec2baa98f8864263a3cd11d608707.zip
Merge 0.7/waqas->0.7/MattJ
-rw-r--r--net/server_event.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index af6da45e..5e62f3fd 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -20,14 +20,14 @@ 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 = 60, -- timout in seconds per handshake attemp
+ MAX_HANDSHAKE_ATTEMPS = 1000, -- attempts to finish ssl handshake
+ HANDSHAKE_TIMEOUT = 60, -- timout in seconds per handshake attempt
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
+ ACCEPT_DELAY = 10, -- seconds to wait until the next attempt of a full server to accept
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
+ CONNECT_TIMEOUT = 20, -- timeout in seconds for connection attempts
CLEAR_DELAY = 5, -- seconds to wait for clearing interface list (and calling ondisconnect listeners)
DEBUG = true, -- show debug messages
}