diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-02 22:33:11 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-02 22:33:11 +0200 |
commit | c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (patch) | |
tree | b4ffbcba45331b7fa86a9e1d1881e94b8fef9d42 /plugins/mod_c2s.lua | |
parent | a540fdb9f448eb0990899b70e0ed8ab926e979f6 (diff) | |
parent | 69d97b4f7ed15249ce71a5b261bff98a008684aa (diff) | |
download | prosody-c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee.tar.gz prosody-c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_c2s.lua')
-rw-r--r-- | plugins/mod_c2s.lua | 6 |
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"); |