aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-22 02:00:27 +0100
committerKim Alvefur <zash@zash.se>2016-01-22 02:00:27 +0100
commitc46a125d7363226cef1b57ff886fced09ca57df1 (patch)
treee2355f08f8212a7ef4ca19c9bcbce5943bc4793b
parentc2f74508093fdf804d648a77b72f07c0928a146e (diff)
downloadprosody-c46a125d7363226cef1b57ff886fced09ca57df1.tar.gz
prosody-c46a125d7363226cef1b57ff886fced09ca57df1.zip
server_select: Pause and mark server as full if accepting a client fails (fixes #597)
-rw-r--r--net/server_select.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index f9d8dba1..891151ac 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -258,6 +258,8 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- t
return;
elseif err then -- maybe timeout or something else
out_put( "server.lua: error with new client connection: ", tostring(err) )
+ handler.pause( )
+ _fullservers[ handler ] = _currenttime
return false
end
end