mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encry...

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 1fb8dcf571f8b072fb26dec9a0a632fcc822040a..3bdffc7d5537c0801032e46bb3f3ab97098d2486 100644 (file)
--- 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();

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

diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index ec8ea4d47941e7bc7faddd2cc5b751edbc3b4c4d..dbbef3603355e00c73b8bf91ae743dd62c8c8648 100644 (file)
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -270,6 +270,7 @@ function s2sout.make_connect(host_session, connect_host, connect_port)
        -- Reset secure flag in case this is another
        -- connection attempt after a failed STARTTLS
        host_session.secure = nil;
+       host_session.encrypted = nil;
 
        local conn, handler;
        local proto = connect_host.proto;