mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server_event: Schedule another read callback if there is still data left in buffer after reading (fixes #583 for real)

Browse source
This commit is contained in:
Kim Alvefur 2016-05-04 15:29:11 +02:00
parent 8e0208a805
commit b1ec0f7993
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/server_event.lua
View file

@ -30,6 +30,7 @@ local cfg = {
WRITE_TIMEOUT = 180, -- timeout in seconds for write data on socket
CONNECT_TIMEOUT = 20, -- timeout in seconds for connection attempts
CLEAR_DELAY = 5, -- seconds to wait for clearing interface list (and calling ondisconnect listeners)
READ_RETRY_DELAY = 1e-06, -- if, after reading, there is still data in buffer, wait this long and continue reading
DEBUG = true, -- show debug messages
}
@ -559,7 +560,7 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
interface.eventread = nil
return -1
end
if EV_TIMEOUT == event and interface:onreadtimeout() ~= true then
if EV_TIMEOUT == event and not interface.conn:dirty() and interface:onreadtimeout() ~= true then
return -1 -- took too long to get some data from client -> disconnect
end
if interface._usingssl then -- handle luasec
@ -605,6 +606,9 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx
interface.eventread = nil;
return -1;
end
if interface.conn:dirty() then -- still data left in buffer
return EV_TIMEOUT, cfg.READ_RETRY_DELAY;
end
return EV_READ, cfg.READ_TIMEOUT
end