# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1334860510 -3600
# Node ID d00f31470fcf0c7a660dd28614f9f7004dbf2426
# Parent  e00b4ec5fca413af545cdcbcb3388a23d0a6dffe# Parent  cdab466551bd60aa0f2db1b5d1e7dbdc13b78579
Merge with 0.9

diff -r e00b4ec5fca4 -r d00f31470fcf plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Thu Mar 22 16:51:39 2012 +0000
+++ b/plugins/mod_bosh.lua	Thu Apr 19 19:35:10 2012 +0100
@@ -123,10 +123,10 @@
 	
 	-- stream:feed() calls the stream_callbacks, so all stanzas in
 	-- the body are processed in this next line before it returns.
-	-- In particular, the streamopened() stream callback is where
-	-- much of the session logic happens, because it's where we first
-	-- get to see the 'sid' of this request.
-	stream:feed(body);
+	local ok, err = stream:feed(body);
+	if not ok then
+		log("error", "Failed to parse BOSH payload: %s", err);
+	end
 	
 	-- Stanzas (if any) in the request have now been processed, and
 	-- we take care of the high-level BOSH logic here, including