diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-27 12:23:19 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-27 12:23:19 +0100 |
| commit | 31b47ca492ba0a844e301085dd530d63f43141e6 (patch) | |
| tree | f90375b97b687b9dcb19e55c0bf48053c57549e7 | |
| parent | 7e1a61f76b04981306d02759f4a8c07c8af9ea86 (diff) | |
| parent | 8ee33e543a323a86867e28a68be8c2c542f261c3 (diff) | |
| download | prosody-31b47ca492ba0a844e301085dd530d63f43141e6.tar.gz prosody-31b47ca492ba0a844e301085dd530d63f43141e6.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_tls.lua | 6 |
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; |