aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-02 15:28:41 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-02 15:28:41 +0100
commita5f20c7ca1e58165e1e0e66fbf051d610b467753 (patch)
treef1f7e71f8e6c2be0ce3b8d49bf4d06f0b92b4f18
parent3415a3da2add388452f19386d7b37bffec49a2a7 (diff)
parent0193bc555b8c9c4751311967e7ec951641818c65 (diff)
downloadprosody-a5f20c7ca1e58165e1e0e66fbf051d610b467753.tar.gz
prosody-a5f20c7ca1e58165e1e0e66fbf051d610b467753.zip
Merge 0.8->trunk
-rw-r--r--util/xmppstream.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index cf485dac..70420424 100644
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -167,9 +167,12 @@ function new_sax_handlers(session, stream_callbacks)
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