projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8ccdea2
)
net.server_event: Check the buffer *length*, not the buffer itself (Fixes 100% cpu...
author
Kim Alvefur
<zash@zash.se>
Tue, 19 Apr 2016 16:58:30 +0000
(18:58 +0200)
committer
Kim Alvefur
<zash@zash.se>
Tue, 19 Apr 2016 16:58:30 +0000
(18:58 +0200)
net/server_event.lua
patch
|
blob
|
history
diff --git
a/net/server_event.lua
b/net/server_event.lua
index 59bd269af2dcd48eb9d23313951aef2782a84999..882d10ed95d0e45d3436ed663c73c84258bd4ddb 100644
(file)
--- a/
net/server_event.lua
+++ b/
net/server_event.lua
@@
-545,7
+545,7
@@
do
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.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
-- data possibly written from ondrain
return EV_WRITE, cfg.WRITE_TIMEOUT
elseif interface.eventreadtimeout then