diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-05 18:35:02 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-05 18:35:02 +0000 |
| commit | f3d2b07f3f93458d5b5c348af576c7d2f317f16e (patch) | |
| tree | c58364b5a626dd3ebe79dc4c3b37a73bd0e1076d /net/server_select.lua | |
| parent | 651f61921bc5a867fdba3337ae7541fa4feccf7d (diff) | |
| parent | a201db970b44ac05204b19aa1c3fa973ea6e2e2a (diff) | |
| download | prosody-f3d2b07f3f93458d5b5c348af576c7d2f317f16e.tar.gz prosody-f3d2b07f3f93458d5b5c348af576c7d2f317f16e.zip | |
Merge with 0.7
Diffstat (limited to 'net/server_select.lua')
| -rw-r--r-- | net/server_select.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index c4a1f19a..49cbe25d 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -430,7 +430,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 (err == "wantread" or err == "timeout") or string_len(part) > 0 then -- received something + if not err or (err == "wantread" or err == "timeout") or (part and string_len(part) > 0) then -- received something local buffer = buffer or part or "" local len = string_len( buffer ) if len > maxreadlen then |