Merge 0.9->0.10

[prosody.git] / plugins / mod_s2s / mod_s2s.lua

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 1d03f3e4e57eb208e59ddf4074d8a3b23b7cabe8..5afb958c4462e0270c73041bbdafe5f794f75011 100644 (file)
--- 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