Mercurial > prosody-hg

diff plugins/mod_c2s.lua @ 5861:c3ee62b3bdfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 07 Oct 2013 12:56:53 +0200
parents e327f2d4e09f
children 98b768a41c9d
line wrap: on
line diff
--- a/plugins/mod_c2s.lua	Sun Oct 06 23:53:15 2013 +0200
+++ b/plugins/mod_c2s.lua	Mon Oct 07 12:56:53 2013 +0200
@@ -69,6 +69,7 @@
 	-- since we now have a new stream header, session is secured
 	if session.secure == false then
 		session.secure = true;
+		session.encrypted = true;
 
 		local sock = session.conn:socket();
 		if sock.info then
@@ -209,6 +210,7 @@
 	-- Client is using legacy SSL (otherwise mod_tls sets this flag)
 	if conn:ssl() then
 		session.secure = true;
+		session.encrypted = true;
 
 		-- Check if TLS compression is used
 		local sock = conn:socket();