X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fxmppstream.lua;h=138c86b744832b4e45f98798e64caf30fac664b5;hb=533fc1fa57ce10fc0821f8edaeb247f2710a543c;hp=9cdd6471d834b9051fd4b7dd869f9f17c41c2e70;hpb=dc09ff3fec97ad953f781f8ec4267f66e7d785e4;p=prosody.git

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 9cdd6471..138c86b7 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -109,7 +109,7 @@ function new_sax_handlers(session, stream_callbacks, cb_handleprogress)
 					end
 				else
 					-- Garbage before stream?
-					cb_error(session, "no-stream");
+					cb_error(session, "no-stream", tagname);
 				end
 				return;
 			end
@@ -157,11 +157,11 @@ function new_sax_handlers(session, stream_callbacks, cb_handleprogress)
 	function xml_handlers:CharacterData(data)
 		if stanza then
 			if lxp_supports_bytecount then
-				stanza_size = stanza_size + #data --self:getcurrentbytecount();
+				stanza_size = stanza_size + self:getcurrentbytecount();
 			end
 			t_insert(chardata, data);
 		elseif lxp_supports_bytecount then
-			cb_handleprogress(#data--[[self:getcurrentbytecount()]]);
+			cb_handleprogress(self:getcurrentbytecount());
 		end
 	end
 	function xml_handlers:EndElement(tagname)
@@ -238,12 +238,12 @@ function new(session, stream_callbacks, stanza_size_limit)
 	end
 
 	local handlers, meta = new_sax_handlers(session, stream_callbacks, handle_progress);
-	local parser = new_parser(handlers, ns_separator);
+	local parser = new_parser(handlers, ns_separator, false);
 	local parse = parser.parse;
 
 	return {
 		reset = function ()
-			parser = new_parser(handlers, ns_separator);
+			parser = new_parser(handlers, ns_separator, false);
 			parse = parser.parse;
 			n_outstanding_bytes = 0;
 			meta.reset();