diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
| commit | c47fa42628b2119f7e37e83f22919bc905a53624 (patch) | |
| tree | 5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /plugins/mod_c2s.lua | |
| parent | 46105d64bf9627c8618624281c966ec784f4fc12 (diff) | |
| parent | c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (diff) | |
| download | prosody-c47fa42628b2119f7e37e83f22919bc905a53624.tar.gz prosody-c47fa42628b2119f7e37e83f22919bc905a53624.zip | |
Merge 0.10->trunk
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"); |