diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 18:23:44 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 18:23:44 +0200 |
| commit | bcaeb22eb70574d9a025e3a6d87e2c7d7b786654 (patch) | |
| tree | a73f0e5a8a0c4d19faa2ab9da327b9b5568d1d31 | |
| parent | ac987c6332df2b94fd9a7457e20392ae2be5207f (diff) | |
| parent | be79af9fbb47f35b0bccf0337e8035e5b070d390 (diff) | |
| download | prosody-bcaeb22eb70574d9a025e3a6d87e2c7d7b786654.tar.gz prosody-bcaeb22eb70574d9a025e3a6d87e2c7d7b786654.zip | |
Merge 0.10->trunk
| -rw-r--r-- | net/server_event.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 025e3949..cfe9c6f5 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -518,12 +518,11 @@ 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.eventreadtimeout then - return EV_WRITE, EV_TIMEOUT - end - if interface.writebuffer ~= 0 then + elseif interface.writebuffer ~= 0 then -- data possibly written from ondrain return EV_WRITE, cfg.WRITE_TIMEOUT + elseif interface.eventreadtimeout then + return EV_WRITE, cfg.WRITE_TIMEOUT end interface.eventwrite = nil return -1 |