Diff

core/sessionmanager.lua @ 6843:161cccfdf015

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 22 Sep 2015 01:31:52 +0200
parent 6842:eed846384178
child 6915:9d74373d621e
line wrap: on
line diff
--- a/core/sessionmanager.lua	Sat Sep 19 17:51:20 2015 +0200
+++ b/core/sessionmanager.lua	Tue Sep 22 01:31:52 2015 +0200
@@ -37,9 +37,15 @@
 		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]+$");