Mercurial > prosody-hg
comparison core/xmlhandlers.lua @ 4288:8fde6b6b4919
Merge 0.6->0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 15:23:58 +0100 |
| parents | 5a0144a032d8 ee6a18f10a8d |
| children |
comparison
equal
deleted
inserted
replaced
| 4281:5a0144a032d8 | 4288:8fde6b6b4919 |
|---|---|
| 148 end | 148 end |
| 149 stanza, chardata = nil, {}; | 149 stanza, chardata = nil, {}; |
| 150 end | 150 end |
| 151 end | 151 end |
| 152 | 152 |
| 153 local function restricted_handler() | 153 local function restricted_handler(parser) |
| 154 cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1."); | 154 cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1."); |
| 155 if not parser:stop() then | |
| 156 error("Failed to abort parsing"); | |
| 157 end | |
| 155 end | 158 end |
| 156 | 159 |
| 157 if lxp_supports_doctype then | 160 if lxp_supports_doctype then |
| 158 xml_handlers.StartDoctypeDecl = restricted_handler; | 161 xml_handlers.StartDoctypeDecl = restricted_handler; |
| 159 end | 162 end |
