aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-24 14:18:25 +0100
committerKim Alvefur <zash@zash.se>2016-11-24 14:18:25 +0100
commitd77094644a04481987b841c25f5ef987be1a3a88 (patch)
tree092bb85e6687d0c7bfd65269db958ac16a60d37c
parent58a712e247dbaede24c3297260bae145e0ede16e (diff)
parentf91ba70e322e1ec1fcd42dfc0189fb9b80939034 (diff)
downloadprosody-d77094644a04481987b841c25f5ef987be1a3a88.tar.gz
prosody-d77094644a04481987b841c25f5ef987be1a3a88.zip
Merge 0.9->0.10
-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 02839062..12aef9d8 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -421,6 +421,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