projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a90f9bd
)
Merge 0.10->trunk
author
Kim Alvefur
<zash@zash.se>
Tue, 19 Apr 2016 17:00:46 +0000
(19:00 +0200)
committer
Kim Alvefur
<zash@zash.se>
Tue, 19 Apr 2016 17:00:46 +0000
(19:00 +0200)
net/server_event.lua
patch
|
blob
|
history
diff --git
a/net/server_event.lua
b/net/server_event.lua
index cfe9c6f58b3482f610647ae6cf6e6d90a7a8164b..08524646c19e4ebf2aa63e89f1e4d6e92ae1a648 100644
(file)
--- 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.writebuffer
len
~= 0 then
-- data possibly written from ondrain
return EV_WRITE, cfg.WRITE_TIMEOUT
elseif interface.eventreadtimeout then