diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-04 10:53:16 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-04 10:53:16 +0100 |
| commit | 934231da3fd3160a4085b67b4b04b67bc0532945 (patch) | |
| tree | 5e8aa2941ebd2ba5d215cfc9b992b910b394ac5a | |
| parent | 5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4 (diff) | |
| parent | f5f1dd31ef472f6ad9f50ed0be861dfadf1b0542 (diff) | |
| download | prosody-934231da3fd3160a4085b67b4b04b67bc0532945.tar.gz prosody-934231da3fd3160a4085b67b4b04b67bc0532945.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_net_multiplex.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mod_net_multiplex.lua b/plugins/mod_net_multiplex.lua index ad6f0214..6db49391 100644 --- a/plugins/mod_net_multiplex.lua +++ b/plugins/mod_net_multiplex.lua @@ -67,5 +67,6 @@ module:provides("net", { module:provides("net", { name = "multiplex_ssl"; config_prefix = "ssl"; + encryption = "ssl"; listener = listener; }); |