Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 11 Jun 2013 21:50:41 +0100
changeset 5674 ebdbf4cf0b2f
parent 5669 9345c161481f (current diff)
parent 5673 9ca4d1ada906 (diff)
child 5677 9afc94c4346e
Merge 0.9->trunk
core/certmanager.lua
plugins/mod_admin_telnet.lua
plugins/mod_bosh.lua
--- a/core/certmanager.lua	Tue Jun 11 21:36:15 2013 +0200
+++ b/core/certmanager.lua	Tue Jun 11 21:50:41 2013 +0100
@@ -64,6 +64,8 @@
 		verifyext = user_ssl_config.verifyext or default_verifyext;
 		options = user_ssl_config.options or default_options;
 		depth = user_ssl_config.depth;
+		curve = user_ssl_config.curve;
+		dhparam = user_ssl_config.dhparam;
 	};
 
 	local ctx, err = ssl_newcontext(ssl_config);