From: Kim Alvefur <zash@zash.se>
Date: Tue, 19 Apr 2016 17:00:19 +0000 (+0200)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=550b468d8b1293ad7c45370cd2fd249a53894a36;hp=d091b0767be48c0ecc94cf333b6a3cf46c44105e;p=prosody.git

Merge 0.9->0.10
---

diff --git a/net/server_event.lua b/net/server_event.lua
index 5fd49d0a..1329a43d 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -518,7 +518,7 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
 				elseif interface.startsslcallback then  -- start ssl connection if needed
 					debug "starting ssl handshake after writing"
 					interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 )
-				elseif interface.writebuffer ~= 0 then
+				elseif interface.writebufferlen ~= 0 then
 					-- data possibly written from ondrain
 					return EV_WRITE, cfg.WRITE_TIMEOUT
 				elseif interface.eventreadtimeout then