Mercurial > prosody-hg
comparison plugins/mod_tls.lua @ 7717:9c8eb0239eef
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 05 Nov 2016 00:28:30 +0100 |
| parents | 0d93dfc2fbfd |
| children | 94c0c8649826 |
comparison
equal
deleted
inserted
replaced
| 7707:7bb1cc7278b6 | 7717:9c8eb0239eef |
|---|---|
| 121 session.sends2s(starttls_initiate); | 121 session.sends2s(starttls_initiate); |
| 122 return true; | 122 return true; |
| 123 end | 123 end |
| 124 end, 500); | 124 end, 500); |
| 125 | 125 |
| 126 module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) | 126 module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza) -- luacheck: ignore 212/stanza |
| 127 module:log("debug", "Proceeding with TLS on s2sout..."); | 127 module:log("debug", "Proceeding with TLS on s2sout..."); |
| 128 session:reset_stream(); | 128 session:reset_stream(); |
| 129 session.conn:starttls(session.ssl_ctx); | 129 session.conn:starttls(session.ssl_ctx); |
| 130 session.secure = false; | 130 session.secure = false; |
| 131 return true; | 131 return true; |
