diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:23:58 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-06-02 15:23:58 +0100 |
commit | d90814ef61e537efb472dfe186524b254594dc62 (patch) | |
tree | 46089956a4bc673ded328e7a665b0fc34acd65a9 | |
parent | 649aa772aadb66ccd8773e81c6981be057a3addb (diff) | |
parent | a684be25dba02b42f21cd45373bf55b70ab368a8 (diff) | |
download | prosody-d90814ef61e537efb472dfe186524b254594dc62.tar.gz prosody-d90814ef61e537efb472dfe186524b254594dc62.zip |
Merge 0.6->0.7
-rw-r--r-- | core/xmlhandlers.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua index 10f02d0b..d86ffe7d 100644 --- a/core/xmlhandlers.lua +++ b/core/xmlhandlers.lua @@ -150,8 +150,11 @@ function init_xmlhandlers(session, stream_callbacks) 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 |