diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-19 18:58:30 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-19 18:58:30 +0200 |
| commit | c960febdd809ad86256ce42a1cea7acec66b1c30 (patch) | |
| tree | d08b53cf25aca5a46865c0ccb5eaa7505685abd4 /net | |
| parent | 66970561d010c558a5abf3a86dbaf59e65b454bc (diff) | |
| download | prosody-c960febdd809ad86256ce42a1cea7acec66b1c30.tar.gz prosody-c960febdd809ad86256ce42a1cea7acec66b1c30.zip | |
net.server_event: Check the buffer *length*, not the buffer itself (Fixes 100% cpu usage introduced in 65abd9d7bf88)
Diffstat (limited to 'net')
| -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 59bd269a..882d10ed 100644 --- 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.writebuffer ~= 0 then + elseif interface.writebufferlen ~= 0 then -- data possibly written from ondrain return EV_WRITE, cfg.WRITE_TIMEOUT elseif interface.eventreadtimeout then |