aboutsummaryrefslogtreecommitdiff
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
commitf440f0b269e299eca2e0adc63bba5bb2080d3123 (patch)
treec5d7576a0e98a1c0bee8ddeb28a199f3e3226980 /net
parentd4ba117540bf5d434e939217f8c07edbf138ae89 (diff)
parente1d1e9194fa87f6da15c50d62681a2c41a66dfed (diff)
downloadprosody-im-server-f440f0b269e299eca2e0adc63bba5bb2080d3123.tar
prosody-im-server-f440f0b269e299eca2e0adc63bba5bb2080d3123.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