aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_tls.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-27 12:23:19 +0100
committerKim Alvefur <zash@zash.se>2017-01-27 12:23:19 +0100
commit4ec8a2f5b5961e90db28d92afd1f685966d8fe42 (patch)
treef90375b97b687b9dcb19e55c0bf48053c57549e7 /plugins/mod_tls.lua
parent4c6a84a00ef37846e432ba76e3771087d23cceb1 (diff)
parentc8b213ff4f88ac6c0d21e58669d399d12f82c5b8 (diff)
downloadprosody-4ec8a2f5b5961e90db28d92afd1f685966d8fe42.tar.gz
prosody-4ec8a2f5b5961e90db28d92afd1f685966d8fe42.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
-rw-r--r--plugins/mod_tls.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index c5903b61..2b265032 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -62,10 +62,10 @@ do
end
local function can_do_tls(session)
- if session.ssl_ctx ~= nil then
- return session.ssl_ctx;
- elseif not session.conn.starttls then
+ if not session.conn.starttls then
return false;
+ elseif session.ssl_ctx ~= nil then
+ return session.ssl_ctx;
end
if session.type == "c2s_unauthed" then
session.ssl_ctx = ssl_ctx_c2s;