aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_select.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-06-09 17:00:26 +0200
committerKim Alvefur <zash@zash.se>2013-06-09 17:00:26 +0200
commit4fd33aaeaebada634436d77eb947bffacef74de8 (patch)
tree8fe6725c3107c0a9ef25dd6c251e1a0e63f0b630 /net/server_select.lua
parent0b1d85780d7478c853891020d138b727710257f6 (diff)
downloadprosody-4fd33aaeaebada634436d77eb947bffacef74de8.tar.gz
prosody-4fd33aaeaebada634436d77eb947bffacef74de8.zip
net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn)
Diffstat (limited to 'net/server_select.lua')
-rw-r--r--net/server_select.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index a6e91d0b..d0894715 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -263,7 +263,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
if socket:getfd() >= _maxfd then
out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent
socket:close( ) -- Should we send some kind of error here?
- server.pause( )
+ if server then
+ server.pause( )
+ end
return nil, nil, "fd-too-large"
end
socket:settimeout( 0 )