aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-06-09 17:03:15 +0200
committerKim Alvefur <zash@zash.se>2013-06-09 17:03:15 +0200
commit0086d5819d632016a5795c9718be2f35c22ac8f5 (patch)
treed2df3e2e2d6e79961b1a312a8049eed3f6c55da5
parenta07cafce699eefa1c588171d29ce9ad8944d30a1 (diff)
parent4675a091eb6a3f877c47b95f03026b8688c66d05 (diff)
downloadprosody-0086d5819d632016a5795c9718be2f35c22ac8f5.tar.gz
prosody-0086d5819d632016a5795c9718be2f35c22ac8f5.zip
Merge 0.9->trunk
-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 4d0f3f94..98e9f847 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 )