diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-22 01:31:52 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-22 01:31:52 +0200 |
commit | 5dcb0569722d6feea8942fd5acc8af7805060f8b (patch) | |
tree | f6ad57a51df3f189d7ece7f43682e7ccd147537c /core | |
parent | 9b97c52790a17ea25e0e7ab96fe62280e4dbfea8 (diff) | |
parent | 366a13d95f528d6dba5e5ae05910fe6675c28df9 (diff) | |
download | prosody-5dcb0569722d6feea8942fd5acc8af7805060f8b.tar.gz prosody-5dcb0569722d6feea8942fd5acc8af7805060f8b.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r-- | core/sessionmanager.lua | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index 616f38a8..bc4d7cef 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -37,9 +37,15 @@ local function new_session(conn) if t then t = filter("bytes/out", tostring(t)); if t then - return w(conn, t); + local ret, err = w(conn, t); + if not ret then + session.log("error", "Write-error: %s", tostring(err)); + return false; + end + return true; end end + return true; end session.ip = conn:ip(); local conn_name = "c2s"..tostring(session):match("[a-f0-9]+$"); |