Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Wed, 24 Mar 2010 22:48:12 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Wed, 24 Mar 2010 22:48:12 +0000
- changeset 2940
- 7486b9216879
- parent 2938
- 07f3b14d38d1 (current diff)
- parent 2939
- dc73cbc69bd5 (diff)
- child 2942
- 29ec7cd77f81
Merge 0.7->trunk
--- a/net/server_event.lua Wed Mar 24 22:41:43 2010 +0000 +++ b/net/server_event.lua Wed Mar 24 22:48:12 2010 +0000 @@ -21,12 +21,12 @@ 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
