Merge 0.8->trunk

diff --cc util/xmppstream.lua
index 69e7690d3b891cfe8919e20edb75d36e2997469a,cf485daceb5e1000c2fe1feb957b2b365469e839..7042042424ab984271979404a0772c707237d06c
--- 1/util/xmppstream.lua
--- 2/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@@ -157,14 -164,12 +164,15 @@@ function new_sax_handlers(session, stre
                                cb_error(session, "parse-error", "unexpected-element-close", name);
                        end
                        stanza, chardata = nil, {};
+                       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