# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266412962 0
# Node ID bb9b4cb30c567485192e51eeba2798b2ac3b53f0
# Parent  42a6e4d09b09a3c8a06a3ae987c9d5b41c3b0a67# Parent  9fab590093979cb1c2e725a7c656e63346c4ea1e
Merge with 0.7

diff -r 42a6e4d09b09 -r bb9b4cb30c56 net/server_event.lua
--- 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