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

Merge 0.10->trunk
---

diff --git a/net/server_event.lua b/net/server_event.lua
index cfe9c6f5..08524646 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