# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1351101382 -7200
# Node ID 42765c80244c0192005ec8ac06b64e1029de2d7d
# Parent  3b93f92c613aa19251da0c631c9c55109976bbf2# Parent  b22d24b5a89a0aec62f50d5d9a5534ee347999e0
Merge 0.9 -> trunk

diff -r 3b93f92c613a -r 42765c80244c plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Sun Oct 14 22:53:41 2012 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Wed Oct 24 19:56:22 2012 +0200
@@ -184,6 +184,14 @@
 	-- 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