aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-26 20:11:03 +0100
committerKim Alvefur <zash@zash.se>2016-11-26 20:11:03 +0100
commit728d74d8bf721e7f9377bcdeea7e456f15d0e856 (patch)
tree5fafe37e76936f880749432bffa3174a7ca120cd /net
parentc8bbcabaf7597f13bace9e5aefc98ecb9e172796 (diff)
parent1b95aabe8959649223e49482b31eea221844d7a3 (diff)
downloadprosody-728d74d8bf721e7f9377bcdeea7e456f15d0e856.tar.gz
prosody-728d74d8bf721e7f9377bcdeea7e456f15d0e856.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 0776b02e..f051da24 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -416,6 +416,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
end
handler.port = handler.clientport -- COMPAT server_event
local write = function( self, data )
+ if not handler then return false end
bufferlen = bufferlen + #data
if bufferlen > maxsendlen then
_closelist[ handler ] = "send buffer exceeded" -- cannot close the client at the moment, have to wait to the end of the cycle