Software / code / prosody
Changeset
7870:a858066faac6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 27 Jan 2017 12:23:19 +0100 |
| parents | 7868:11fcdef5022f (current diff) 7869:eb5fba4c8074 (diff) |
| children | 7874:de3c6fb74759 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_tls.lua Thu Jan 26 19:47:33 2017 +0100 +++ b/plugins/mod_tls.lua Fri Jan 27 12:23:19 2017 +0100 @@ -62,10 +62,10 @@ end local function can_do_tls(session) - if session.ssl_ctx ~= nil then + if not session.conn.starttls then + return false; + elseif session.ssl_ctx ~= nil then return session.ssl_ctx; - elseif not session.conn.starttls then - return false; end if session.type == "c2s_unauthed" then session.ssl_ctx = ssl_ctx_c2s;
