Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 02 Jun 2011 15:28:41 +0100
changeset 4290 aaa06e68a9e4
parent 4286 1bceebe2b117 (current diff)
parent 4289 1e68721c02f2 (diff)
child 4291 122f142da281
Merge 0.8->trunk
util/xmppstream.lua
--- a/util/xmppstream.lua	Thu Jun 02 02:31:18 2011 +0100
+++ b/util/xmppstream.lua	Thu Jun 02 15:28:41 2011 +0100
@@ -167,9 +167,12 @@
 			stack = {};
 		end
 	end
-	
-	local function restricted_handler()
+
+	local function restricted_handler(parser)
 		cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1.");
+		if not parser:stop() then
+			error("Failed to abort parsing");
+		end
 	end
 	
 	if lxp_supports_doctype then