Merge 0.7->0.8

diff --cc util/xmppstream.lua
index d1cb652d7a85af52dc5b34ce718793fd740fa671,ed5395b5b0c9f2962dddbf7244635bf57d0c388e..66f2e53410aa3b0e70810da794899dea09b69fe3
--- 1/util/xmppstream.lua
--- 2/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@@ -160,17 -141,6 +160,16 @@@ function new_sax_handlers(session, stre
                end
        end
        
-       xml_handlers.StartCdataSection = restricted_handler;
 +      local function restricted_handler()
 +              cb_error(session, "parse-error", "restricted-xml", "Restricted XML, see RFC 6120 section 11.1.");
 +      end
 +      
 +      if lxp_supports_doctype then
 +              xml_handlers.StartDoctypeDecl = restricted_handler;
 +      end
 +      xml_handlers.Comment = restricted_handler;
 +      xml_handlers.ProcessingInstruction = restricted_handler;
 +      
        local function reset()
                stanza, chardata = nil, {};
        end