aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.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
commit7da00de6e9c6990da97da982a4691213562d6e22 (patch)
tree121f351fb160d4534449768e1c2808a66e05e74e /plugins/mod_s2s/mod_s2s.lua
parentdbb308a3935ce41afa777500b828ed21bb7e508a (diff)
parent913e2225b5dcf1baf7d623122046da4f27766a04 (diff)
downloadprosody-7da00de6e9c6990da97da982a4691213562d6e22.tar.gz
prosody-7da00de6e9c6990da97da982a4691213562d6e22.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 1d03f3e4..5afb958c 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -283,6 +283,7 @@ function stream_callbacks.streamopened(session, attr)
-- TODO: Rename session.secure to session.encrypted
if session.secure == false then
session.secure = true;
+ session.encrypted = true;
local sock = session.conn:socket();
if sock.info then