# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1307024892 -3600
# Node ID 1e68721c02f200f5bf8d4811e9a58b15a531f697
# Parent  c806a599224ace5e4ada6bafebb678054d95b705# Parent  8fde6b6b4919df7288138835551df3ed70e0d42c
Merge 0.7->0.8

diff -r c806a599224a -r 1e68721c02f2 util/xmppstream.lua
--- a/util/xmppstream.lua	Thu Jun 02 02:30:26 2011 +0100
+++ b/util/xmppstream.lua	Thu Jun 02 15:28:12 2011 +0100
@@ -159,9 +159,12 @@
 			stanza, chardata = nil, {};
 		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