diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-26 11:55:27 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-26 11:55:27 +0200 |
commit | 0c291f3a41eb20f4af48c535eb3b7cfa144b5778 (patch) | |
tree | c7d9b10298595fe019de63ce1fb4853be587de49 /plugins/mod_tls.lua | |
parent | d10300eca4067bdc68a16675a4065f608c88381d (diff) | |
parent | 3431032994baafdf6345ea3d22a447eee7e9197d (diff) | |
download | prosody-0c291f3a41eb20f4af48c535eb3b7cfa144b5778.tar.gz prosody-0c291f3a41eb20f4af48c535eb3b7cfa144b5778.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
-rw-r--r-- | plugins/mod_tls.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 48613b9a..029ddd1d 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -35,7 +35,8 @@ local host = hosts[module.host]; local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin; local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin; -do + +function module.load() local NULL, err = {}; local modhost = module.host; local parent = modhost:match("%.(.*)$"); @@ -61,6 +62,8 @@ do if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err); end end +module:hook_global("config-reloaded", module.load); + local function can_do_tls(session) if not session.conn.starttls then if not session.secure then |