aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-04-19 19:00:46 +0200
committerKim Alvefur <zash@zash.se>2016-04-19 19:00:46 +0200
commitb42b0643f07546e85488e7384b960fcdd961db7e (patch)
tree5dc4e5efd72ad25de87e42f7b51f7cd7a209a515
parente81b3519746ee2933e643a235c18a2246b56dbf2 (diff)
parent4c8e24cd0aa6c4ff6d84f8b9340d146220752cf7 (diff)
downloadprosody-b42b0643f07546e85488e7384b960fcdd961db7e.tar.gz
prosody-b42b0643f07546e85488e7384b960fcdd961db7e.zip
Merge 0.10->trunk
-rw-r--r--net/server_event.lua2
1 files changed, 1 insertions, 1 deletions
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