Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 02 Jun 2011 15:23:58 +0100
changeset 4288 8fde6b6b4919
parent 4281 5a0144a032d8 (current diff)
parent 4287 ee6a18f10a8d (diff)
child 4289 1e68721c02f2
Merge 0.6->0.7
core/xmlhandlers.lua file | annotate | diff | comparison | revisions 
--- a/core/xmlhandlers.lua	Thu Jun 02 00:25:44 2011 +0100
+++ b/core/xmlhandlers.lua	Thu Jun 02 15:23:58 2011 +0100
@@ -150,8 +150,11 @@
 		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
prosody