diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-04 10:53:12 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-04 10:53:12 +0100 |
| commit | d589e26bca988e4345e54bd7ef5a2375be741ad4 (patch) | |
| tree | b5352fa96c0d254fa0109ef658e09fa0257608b5 | |
| parent | 68b56946d1ae6acb23cb935fe1071f2d98f04875 (diff) | |
| parent | 6c35b4e278dc0b0c306c1714fc1490618b183f78 (diff) | |
| download | prosody-d589e26bca988e4345e54bd7ef5a2375be741ad4.tar.gz prosody-d589e26bca988e4345e54bd7ef5a2375be741ad4.zip | |
Merge 0.9->0.10
| -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; }); |