aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-10-24 19:56:22 +0200
committerKim Alvefur <zash@zash.se>2012-10-24 19:56:22 +0200
commitbf9a3cef1f71ed3e0b6cae0b082cb339b47ed01d (patch)
tree2d93f16e8d107baedd6226f11434a1ecc852b9c7
parentdbac5db2dabdfdb13632b0b64f59d1c2cd2b77c6 (diff)
parent9a7f5206098e4af016abdea336b908214fc76255 (diff)
downloadprosody-bf9a3cef1f71ed3e0b6cae0b082cb339b47ed01d.tar.gz
prosody-bf9a3cef1f71ed3e0b6cae0b082cb339b47ed01d.zip
Merge 0.9 -> trunk
-rw-r--r--plugins/mod_s2s/mod_s2s.lua8
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 65379f5b..098a74bd 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -184,6 +184,14 @@ function stream_callbacks.streamopened(session, attr)
-- TODO: Rename session.secure to session.encrypted
if session.secure == false then
session.secure = true;
+
+ -- Check if TLS compression is used
+ local sock = session.conn:socket();
+ if sock.info then
+ session.compressed = sock:info"compression";
+ elseif sock.compression then
+ session.compressed = sock:compression(); --COMPAT mw/luasec-hg
+ end
end
if session.direction == "incoming" then