# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1373324670 -3600
# Node ID 8de1f9290588bcabfecf12aa89638638a6c9e5de
# Parent  c4200292758c611c96856616a1fda45ce9208b79# Parent  2ecf400b194a771c8b17044f2b107e0b7de46c06
Merge 0.9->trunk

diff -r c4200292758c -r 8de1f9290588 plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Mon Jul 08 21:41:31 2013 +0100
+++ b/plugins/mod_bosh.lua	Tue Jul 09 00:04:30 2013 +0100
@@ -20,6 +20,8 @@
 local log = logger.init("mod_bosh");
 local initialize_filters = require "util.filters".initialize;
 local math_min = math.min;
+local xpcall, tostring, type = xpcall, tostring, type;
+local traceback = debug.traceback;
 
 local xmlns_streams = "http://etherx.jabber.org/streams";
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@ -353,6 +355,7 @@
 	end
 end
 
+local function handleerr(err) log("error", "Traceback[bosh]: %s", traceback(tostring(err), 2)); end
 function stream_callbacks.handlestanza(context, stanza)
 	if context.ignore then return; end
 	log("debug", "BOSH stanza received: %s\n", stanza:top_tag());
@@ -362,7 +365,9 @@
 			stanza.attr.xmlns = nil;
 		end
 		stanza = session.filter("stanzas/in", stanza);
-		core_process_stanza(session, stanza);
+		if stanza then
+			return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
+		end
 	end
 end
 
diff -r c4200292758c -r 8de1f9290588 plugins/mod_component.lua
--- a/plugins/mod_component.lua	Mon Jul 08 21:41:31 2013 +0100
+++ b/plugins/mod_component.lua	Tue Jul 09 00:04:30 2013 +0100
@@ -9,6 +9,7 @@
 module:set_global();
 
 local t_concat = table.concat;
+local xpcall, tostring, type = xpcall, tostring, type;
 local traceback = debug.traceback;
 
 local logger = require "util.logger";