aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-29 02:08:56 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-29 02:08:56 +0100
commit6e44aa0d558c49d3443ca2295438eb587a5521aa (patch)
tree8c4e7a02f8e0b1673a4a695a6ac35544e246dde8
parentbbfb44b088e4d16920f18a3cc3dfb19234da8663 (diff)
parent247b811e65f966c3760d13cf42ad1d46c5f1586d (diff)
downloadprosody-6e44aa0d558c49d3443ca2295438eb587a5521aa.tar.gz
prosody-6e44aa0d558c49d3443ca2295438eb587a5521aa.zip
Merge compression fix
-rw-r--r--plugins/mod_compression.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index c2e84f2b..8333a5a1 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -119,7 +119,7 @@ end
-- setup decompression for a stream
local function setup_decompression(session, inflate_stream)
local old_data = session.data
- session.data = function(conn, data)
+ session.data = function(data)
local status, decompressed, eof = pcall(inflate_stream, data);
if status == false then
session:close({
@@ -130,7 +130,7 @@ local function setup_decompression(session, inflate_stream)
module:log("warn", "%s", tostring(decompressed));
return;
end
- old_data(conn, decompressed);
+ old_data(decompressed);
end;
end