Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7/waqas->0.7/MattJ
Tue, 30 Mar 2010 19:46:53 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Tue, 30 Mar 2010 19:46:53 +0100
- changeset 2953
- 3cafa20e22e9
- parent 2951
- 294c359a05f5 (current diff)
- parent 2952
- 5069534f7f36 (diff)
- child 2954
- 24483a7bf420
- child 2961
- db3c0ecce3f4
Merge 0.7/waqas->0.7/MattJ
--- a/net/server_event.lua Tue Mar 30 19:45:56 2010 +0100 +++ b/net/server_event.lua Tue Mar 30 19:46:53 2010 +0100 @@ -20,14 +20,14 @@ 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 }
