Software / code / prosody
Changeset
2657:bb9b4cb30c56
Merge with 0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 17 Feb 2010 13:22:42 +0000 |
| parents | 2655:42a6e4d09b09 (current diff) 2656:9fab59009397 (diff) |
| children | 2658:a4879b1e6cde |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_event.lua Tue Feb 16 17:16:12 2010 +0000 +++ b/net/server_event.lua Wed Feb 17 13:22:42 2010 +0000 @@ -20,14 +20,14 @@ local cfg = { MAX_CONNECTIONS = 100000, -- max per server connections (use "ulimit -n" on *nix) - MAX_HANDSHAKE_ATTEMPS = 10, -- attemps to finish ssl handshake - HANDSHAKE_TIMEOUT = 1, -- timout in seconds per handshake attemp + MAX_HANDSHAKE_ATTEMPS = 1000, -- attemps to finish ssl handshake + HANDSHAKE_TIMEOUT = 30, -- 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 - CONNECT_TIMEOUT = 10, -- timeout in seconds for connection attemps + 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 } @@ -197,7 +197,7 @@ local _, err local attempt = 0 local maxattempt = cfg.MAX_HANDSHAKE_ATTEMPS - while attempt < 1000 do -- no endless loop + while attempt < maxattempt do -- no endless loop attempt = attempt + 1 debug( "ssl handshake of client with id:"..tostring(self).."attemp:"..attempt ) if attempt > maxattempt then
