# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1461085246 -7200
# Node ID f1ff321178d4bb505580c2b3de4ff13e5e5be483
# Parent  e49737de98729c5082376f41a72662b5fbff9a72# Parent  066a4dfdac187c89b5060db4ad63070091fe4a4a
Merge 0.10->trunk

diff -r e49737de9872 -r f1ff321178d4 net/server_event.lua
--- a/net/server_event.lua	Tue Apr 19 18:46:07 2016 +0200
+++ b/net/server_event.lua	Tue Apr 19 19:00:46 2016 +0200
@@ -518,7 +518,7 @@
 				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