diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 19:00:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 19:00:19 +0200 |
| commit | 4c8e24cd0aa6c4ff6d84f8b9340d146220752cf7 (patch) | |
| tree | 451c26ca6d2bb35b6dfded6ba677efe19250eef5 | |
| parent | be79af9fbb47f35b0bccf0337e8035e5b070d390 (diff) | |
| parent | 9f66da1df03bf056fb96f3b7c252e194bdcd6170 (diff) | |
| download | prosody-4c8e24cd0aa6c4ff6d84f8b9340d146220752cf7.tar.gz prosody-4c8e24cd0aa6c4ff6d84f8b9340d146220752cf7.zip | |
Merge 0.9->0.10
| -rw-r--r-- | net/server_event.lua | 2 |
1 files changed, 1 insertions, 1 deletions
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 |