aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_tls.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 16:05:57 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 16:05:57 +0100
commit6403594a10e820f81e9bdffed95d947b7350cca9 (patch)
tree5a6ccfcd8d9fb6e2f2d1d35910732fba43e61132 /plugins/mod_tls.lua
parent367037154898857cf54466a6b5eb8889f04006cb (diff)
parent66618bf09cc664d9375bf41174297714782b4346 (diff)
downloadprosody-6403594a10e820f81e9bdffed95d947b7350cca9.tar.gz
prosody-6403594a10e820f81e9bdffed95d947b7350cca9.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
-rw-r--r--plugins/mod_tls.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index fbeb344b..48613b9a 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -122,7 +122,7 @@ module:hook("s2s-stream-features", function(event)
end);
-- For s2sout connections, start TLS if we can
-module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
+module:hook_tag("http://etherx.jabber.org/streams", "features", function (session, stanza)
module:log("debug", "Received features element");
if can_do_tls(session) and stanza:get_child("starttls", xmlns_starttls) then
module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host);
@@ -131,7 +131,7 @@ module:hook_stanza("http://etherx.jabber.org/streams", "features", function (ses
end
end, 500);
-module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) -- luacheck: ignore 212/stanza
+module:hook_tag(xmlns_starttls, "proceed", function (session, stanza) -- luacheck: ignore 212/stanza
if session.type == "s2sout_unauthed" and can_do_tls(session) then
module:log("debug", "Proceeding with TLS on s2sout...");
session:reset_stream();