comparison 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
comparison
equal deleted inserted replaced
7803:4d182b9a8109 7808:0494bf73dfee
65 }); 65 });
66 66
67 module:provides("net", { 67 module:provides("net", {
68 name = "multiplex_ssl"; 68 name = "multiplex_ssl";
69 config_prefix = "ssl"; 69 config_prefix = "ssl";
70 encryption = "ssl";
70 listener = listener; 71 listener = listener;
71 }); 72 });