X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fserver_select.lua;h=c3777a5ff626783d6634be9ebe01041c9689d01f;hb=4556683c1e90e26917a9d9994e9c609357d320d7;hp=0310a9915ead1febc7753d608b1a933daf22b39e;hpb=5e039f92e23aeb53de8d599b4549880d58ec0519;p=prosody.git

diff --git a/net/server_select.lua b/net/server_select.lua
index 0310a991..c3777a5f 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -149,7 +149,7 @@ _timerlistlen = 0 -- lenght of timerlist
 _sendtraffic = 0 -- some stats
 _readtraffic = 0
 
-_selecttimeout = 3600 -- timeout of socket.select
+_selecttimeout = 1 -- timeout of socket.select
 _sleeptime = 0 -- time to wait at the end of every loop
 
 _maxsendlen = 51000 * 1024 -- max len of send buffer
@@ -530,7 +530,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
 						_readlistlen = addsocket(_readlist, client, _readlistlen)
 						return true
 					else
-						out_put( "server.lua: error during ssl handshake: ", tostring(err) )
 						if err == "wantwrite" and not wrote then
 							_sendlistlen = addsocket(_sendlist, client, _sendlistlen)
 							wrote = true
@@ -538,6 +537,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
 							_readlistlen = addsocket(_readlist, client, _readlistlen)
 							read = true
 						else
+							out_put( "server.lua: ssl handshake error: ", tostring(err) )
 							break;
 						end
 						--coroutine_yield( handler, nil, err )	 -- handshake not finished