aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_c2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-02 22:34:32 +0200
committerKim Alvefur <zash@zash.se>2014-09-02 22:34:32 +0200
commitd21a5e46225b9b62b78cd7eeee1ed6869ef9efa0 (patch)
tree5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /plugins/mod_c2s.lua
parent6594e3042b1afd3ecf39c841c6e631fa57f1ad18 (diff)
parentab57f00b936342c599aadf901f85e5b29ee91baa (diff)
downloadprosody-d21a5e46225b9b62b78cd7eeee1ed6869ef9efa0.tar.gz
prosody-d21a5e46225b9b62b78cd7eeee1ed6869ef9efa0.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_c2s.lua')
-rw-r--r--plugins/mod_c2s.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index bb3858c0..4238b2e7 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -240,9 +240,9 @@ function listener.onconnect(conn)
function session.data(data)
-- Parse the data, which will store stanzas in session.pending_stanzas
if data then
- data = filter("bytes/in", data);
- if data then
- local ok, err = stream:feed(data);
+ data = filter("bytes/in", data);
+ if data then
+ local ok, err = stream:feed(data);
if not ok then
log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
session:close("not-well-formed");