Software / code / prosody
Changeset
5010:2f8f388de516
net.server_event: Don't emit empty packets, check for errors first. (fixes #287)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 25 Jul 2012 20:33:20 +0200 |
| parents | 5009:b27ba2c83dd4 |
| children | 5011:83b4d3727b4f |
| files | net/server_event.lua |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_event.lua Wed Jul 25 20:31:14 2012 +0200 +++ b/net/server_event.lua Wed Jul 25 20:33:20 2012 +0200 @@ -597,16 +597,14 @@ end local buffer, err, part = interface.conn:receive( interface._pattern ) -- receive buffer with "pattern" --vdebug( "read data:", tostring(buffer), "error:", tostring(err), "part:", tostring(part) ) - buffer = buffer or part or "" - local len = string_len( buffer ) - if len > cfg.MAX_READ_LENGTH then -- check buffer length + buffer = buffer or part + if buffer and #buffer > cfg.MAX_READ_LENGTH then -- check buffer length interface.fatalerror = "receive buffer exceeded" debug( "fatal error:", interface.fatalerror ) interface:_close() interface.eventread = nil return -1 end - interface.onincoming( interface, buffer, err ) -- send new data to listener if err and ( err ~= "timeout" and err ~= "wantread" ) then if "wantwrite" == err then -- need to read on write event if not interface.eventwrite then -- register new write event if needed @@ -626,6 +624,8 @@ interface.eventread = nil return -1 end + else + interface.onincoming( interface, buffer, err ) -- send new data to listener end if interface.noreading then interface.eventread = nil;
