aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_c2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-07 12:56:53 +0200
committerKim Alvefur <zash@zash.se>2013-10-07 12:56:53 +0200
commita732f8846e7fcb81ca1e098b0f73fd394d11df54 (patch)
tree121f351fb160d4534449768e1c2808a66e05e74e /plugins/mod_c2s.lua
parent8463f5b4978d92484f85cb3f3c3f08b4f7bb310e (diff)
parentc89ca6cad504e083f310f82177d32dea0e25f462 (diff)
downloadprosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.tar.gz
prosody-a732f8846e7fcb81ca1e098b0f73fd394d11df54.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_c2s.lua')
-rw-r--r--plugins/mod_c2s.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 1fb8dcf5..3bdffc7d 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -69,6 +69,7 @@ function stream_callbacks.streamopened(session, attr)
-- 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 @@ function listener.onconnect(conn)
-- 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();