# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1307024921 -3600
# Node ID aaa06e68a9e4bdb64a6994d92c1e11965097a372
# Parent  1bceebe2b117ded8c15f1bf217df921c9e16f922# Parent  1e68721c02f200f5bf8d4811e9a58b15a531f697
Merge 0.8->trunk

diff -r 1bceebe2b117 -r aaa06e68a9e4 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