diff options
| author | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
| commit | f91009f78a46ad74aa62ff487fa297c06a1ae6a3 (patch) | |
| tree | 8ef6302fc66fdc48b4f34f58c3bea877d7ee6bee /plugins/mod_tls.lua | |
| parent | 8db68f17623ad29b25c6b5d757a2fb0b3d3005c6 (diff) | |
| parent | 8fcbba4b0fccb299121083d97cab065e51fba9d1 (diff) | |
| download | prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.tar.gz prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.zip | |
Merge with tip.
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 8a450803..706b42c9 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -20,9 +20,9 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls, session.send(st.stanza("proceed", { xmlns = xmlns_starttls })); session:reset_stream(); if session.host and hosts[session.host].ssl_ctx_in then - session.conn.set_sslctx(hosts[session.host].ssl_ctx_in); + session.conn:set_sslctx(hosts[session.host].ssl_ctx_in); end - session.conn.starttls(); + session.conn:starttls(); session.log("info", "TLS negotiation started..."); session.secure = false; else @@ -37,9 +37,9 @@ module:add_handler("s2sin_unauthed", "starttls", xmlns_starttls, session.sends2s(st.stanza("proceed", { xmlns = xmlns_starttls })); session:reset_stream(); if session.to_host and hosts[session.to_host].ssl_ctx_in then - session.conn.set_sslctx(hosts[session.to_host].ssl_ctx_in); + session.conn:set_sslctx(hosts[session.to_host].ssl_ctx_in); end - session.conn.starttls(); + session.conn:starttls(); session.log("info", "TLS negotiation started for incoming s2s..."); session.secure = false; else @@ -91,7 +91,7 @@ module:hook_stanza(xmlns_starttls, "proceed", module:log("debug", "Proceeding with TLS on s2sout..."); local format, to_host, from_host = string.format, session.to_host, session.from_host; session:reset_stream(); - session.conn.starttls(true); + session.conn:starttls(true); session.secure = false; return true; end); |