diff plugins/mod_net_multiplex.lua @ 7808:0494bf73dfee

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 04 Jan 2017 10:53:16 +0100
parents caf26fc419e9
children 876171084ea3
line wrap: on
line diff
--- a/plugins/mod_net_multiplex.lua	Mon Jan 02 03:06:51 2017 +0100
+++ b/plugins/mod_net_multiplex.lua	Wed Jan 04 10:53:16 2017 +0100
@@ -67,5 +67,6 @@
 module:provides("net", {
 	name = "multiplex_ssl";
 	config_prefix = "ssl";
+	encryption = "ssl";
 	listener = listener;
 });