diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:28:12 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:28:12 +0100 |
commit | 0193bc555b8c9c4751311967e7ec951641818c65 (patch) | |
tree | 59a90d5dd9c89ffaf83436748582b20f06c1ac0e | |
parent | 7037ff8b95c6d1860b1ca9e42a9916ac237419cc (diff) | |
parent | d90814ef61e537efb472dfe186524b254594dc62 (diff) | |
download | prosody-0193bc555b8c9c4751311967e7ec951641818c65.tar.gz prosody-0193bc555b8c9c4751311967e7ec951641818c65.zip |
Merge 0.7->0.8
-rw-r--r-- | util/xmppstream.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 66f2e534..69e7690d 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -159,9 +159,12 @@ function new_sax_handlers(session, stream_callbacks) 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 |