aboutsummaryrefslogtreecommitdiffstats
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
commit90cf9371a5f050f94ab0cce3cd5b0c00e03788ad (patch)
treec060fbf590599253dd070ff587b959280a82e984
parent29fce4bb4be957f20c2c733b86c2fb8771fe1f70 (diff)
downloadprosody-90cf9371a5f050f94ab0cce3cd5b0c00e03788ad.tar.gz
prosody-90cf9371a5f050f94ab0cce3cd5b0c00e03788ad.zip
net.server_select: Restore checks for wantread/timeout errors on receive
-rw-r--r--net/server_select.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 72a43e9c..f278edd5 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -474,7 +474,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