# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1461085219 -7200
# Node ID 066a4dfdac187c89b5060db4ad63070091fe4a4a
# Parent  a700d54c620a45f221c4d0fde02ae966cfebd8cc# Parent  206f9b0485ad40abc0861f8ef194bcd6585b2b2a
Merge 0.9->0.10

diff -r a700d54c620a -r 066a4dfdac18 net/server_event.lua
--- a/net/server_event.lua	Tue Apr 19 18:23:02 2016 +0200
+++ b/net/server_event.lua	Tue Apr 19 19:00:19 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