diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-01 02:38:05 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-01 02:38:05 +0100 |
| commit | 55ba289bedc1580f49af034b8a849958b698de77 (patch) | |
| tree | 9e8179e3cdc021aa83812cf4bbdb4fd0d9cbc814 /plugins/mod_tls.lua | |
| parent | da6eaea135e293573a6aeaf651ac49288e47e47f (diff) | |
| parent | 9e586ac1dfdf187a7a5d5f80a818c92b13b16f0c (diff) | |
| download | prosody-55ba289bedc1580f49af034b8a849958b698de77.tar.gz prosody-55ba289bedc1580f49af034b8a849958b698de77.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 3903a760..fbeb344b 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -63,7 +63,9 @@ end local function can_do_tls(session) if not session.conn.starttls then - session.log("debug", "Underlying connection does not support STARTTLS"); + if not session.secure then + session.log("debug", "Underlying connection does not support STARTTLS"); + end return false; elseif session.ssl_ctx ~= nil then return session.ssl_ctx; |