projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_storage_sql: Fix commit c806a599224a for compatibility with non-MySQL databases...
[prosody.git]
/
net
/
server_select.lua
diff --git
a/net/server_select.lua
b/net/server_select.lua
index cfd7f3cd98c0c18489fdcdd8ed9732b1979a3d11..13a910f8b4ce52a963b4d54f3067d621415c3c56 100644
(file)
--- a/
net/server_select.lua
+++ b/
net/server_select.lua
@@
-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
@@
-939,6
+939,7
@@
return {
loop = loop,
link = link,
loop = loop,
link = link,
+ step = step,
stats = stats,
closeall = closeall,
addtimer = addtimer,
stats = stats,
closeall = closeall,
addtimer = addtimer,