aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_tls.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-01 02:38:05 +0100
committerKim Alvefur <zash@zash.se>2017-03-01 02:38:05 +0100
commita11a584a59cde70ce4f0880049b9e675d8b2e223 (patch)
tree9e8179e3cdc021aa83812cf4bbdb4fd0d9cbc814 /plugins/mod_tls.lua
parent93f4c5076db39f3cc14bb2ad989ade760da0f107 (diff)
parent4de415d6700cd0f1ab4111cdf4c5f5cb7161c766 (diff)
downloadprosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.tar.gz
prosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
-rw-r--r--plugins/mod_tls.lua4
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;