Changeset

5174:42765c80244c

Merge 0.9 -> trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Oct 2012 19:56:22 +0200
parents 5172:3b93f92c613a (current diff) 5173:b22d24b5a89a (diff)
children 5178:fa6d61f2fe20
files
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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