diff options
| author | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
| commit | 07da428d332ef485dc4aea2f14cde5642fb0ba78 (patch) | |
| tree | ead046279a47ea5984c334f0c6500d85f5970dc8 /plugins/mod_tls.lua | |
| parent | 78fdfac11b141a83604a2887bb831206f71bef54 (diff) | |
| parent | 02919f09518951d7561b8adbb843e88c6fc262ac (diff) | |
| download | prosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.tar.gz prosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 69aafe82..7eedb083 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -123,7 +123,7 @@ module:hook_stanza("http://etherx.jabber.org/streams", "features", function (ses end end, 500); -module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) +module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) -- luacheck: ignore 212/stanza module:log("debug", "Proceeding with TLS on s2sout..."); session:reset_stream(); session.conn:starttls(session.ssl_ctx); |