diff options
| author | Kim Alvefur <zash@zash.se> | 2013-06-09 17:00:26 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-06-09 17:00:26 +0200 |
| commit | d7d15e2ec79c83f13e4dd8bf7c52db658290d336 (patch) | |
| tree | 8fe6725c3107c0a9ef25dd6c251e1a0e63f0b630 /net | |
| parent | 3d65d794a042aa82bbfd1766b616498aba97bdc5 (diff) | |
| download | prosody-d7d15e2ec79c83f13e4dd8bf7c52db658290d336.tar.gz prosody-d7d15e2ec79c83f13e4dd8bf7c52db658290d336.zip | |
net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn)
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_select.lua | 4 |
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 ) |