Changeset

402:81b109281879

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Tue, 09 Feb 2016 23:40:12 +0000
parents 400:0db9cb909cf1 (diff) 401:7be4ebefd1f4 (current diff)
children 403:6f4f60ebb796
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/client.lua	Wed Jan 13 00:45:54 2016 +0100
+++ b/client.lua	Tue Feb 09 23:40:12 2016 +0000
@@ -86,7 +86,7 @@
 	function self.data(conn, data)
 		local ok, err = self.stream:feed(data);
 		if ok then return; end
-		self:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
+		self:debug("Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
 		self:close("xml-not-well-formed");
 	end
 	
--- a/component.lua	Wed Jan 13 00:45:54 2016 +0100
+++ b/component.lua	Tue Feb 09 23:40:12 2016 +0000
@@ -59,7 +59,7 @@
 	function self.data(conn, data)
 		local ok, err = self.stream:feed(data);
 		if ok then return; end
-		stream:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
+		stream:debug("Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
 		stream:close("xml-not-well-formed");
 	end