aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-12-03 19:18:18 +0000
committerMatthew Wild <mwild1@gmail.com>2009-12-03 19:18:18 +0000
commitc82b309e7884e380d28b4326395c3bc52b7b3d8d (patch)
treeed049cd80894b049a6684e2c43aa56745f5662d5 /net
parent3ad72c194c5c6bf425299d5ecaa466b83c1ddf51 (diff)
downloadprosody-c82b309e7884e380d28b4326395c3bc52b7b3d8d.tar.gz
prosody-c82b309e7884e380d28b4326395c3bc52b7b3d8d.zip
net.server_select: Restore checks for wantread/timeout errors on receive
Diffstat (limited to 'net')
-rw-r--r--net/server.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua
index b58d6ee4..ad46071b 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -467,7 +467,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
end
local _readbuffer = function( ) -- this function reads data
local buffer, err, part = receive( socket, pattern ) -- receive buffer with "pattern"
- if not err or string_len(part) > 0 then -- received something
+ if not err or (err == "wantread" or err == "timeout") or string_len(part) > 0 then -- received something
local buffer = buffer or part or ""
local len = string_len( buffer )
if len > maxreadlen then