mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->trunk

Browse source
This commit is contained in:
Kim Alvefur 2013-06-09 17:03:15 +02:00
commit 0086d5819d
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/server_select.lua
View file

@ -263,7 +263,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
if socket:getfd() >= _maxfd then if socket:getfd() >= _maxfd then
out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent
socket:close( ) -- Should we send some kind of error here? socket:close( ) -- Should we send some kind of error here?
server.pause( ) if server then
server.pause( )
end
return nil, nil, "fd-too-large" return nil, nil, "fd-too-large"
end end
socket:settimeout( 0 ) socket:settimeout( 0 )