projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.pluginloader: Add support for multiple plugin directories.
[prosody.git]
/
net
/
server_select.lua
diff --git
a/net/server_select.lua
b/net/server_select.lua
index 0310a9915ead1febc7753d608b1a933daf22b39e..c3777a5ff626783d6634be9ebe01041c9689d01f 100644
(file)
--- 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
_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
_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
_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
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
_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
break;
end
--coroutine_yield( handler, nil, err ) -- handshake not finished