aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-19 19:35:10 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-19 19:35:10 +0100
commitae504e75dcc149a7dbafff6069804631e84b7a0e (patch)
tree8b608d1c2031e9b4193a0307c221116873cfb6ab
parenta1b3f76c8c2d381950fc51b1ee89dd059898766f (diff)
parentf39d1cdd38dd84425c31d8f44972fde25c8d6f91 (diff)
downloadprosody-ae504e75dcc149a7dbafff6069804631e84b7a0e.tar.gz
prosody-ae504e75dcc149a7dbafff6069804631e84b7a0e.zip
Merge with 0.9
-rw-r--r--plugins/mod_bosh.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 9de27b4b..8e87e140 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -123,10 +123,10 @@ function handle_request(method, body, request)
-- 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