Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 15 Oct 2013 10:48:11 +0200
changeset 5875 e4150e6720f7
parent 5873 4669bd7038c7 (current diff)
parent 5874 3321a4b3e6c4 (diff)
child 5876 f62ad84811df
Merge 0.10->trunk
--- a/core/certmanager.lua	Tue Oct 15 01:38:02 2013 +0200
+++ b/core/certmanager.lua	Tue Oct 15 10:48:11 2013 +0200
@@ -54,8 +54,8 @@
 end
 
 if luasec_has_no_compression then -- Has no_compression? Then it has these too...
-	default_options[#default_options+1] = "single_dh_use";
-	default_options[#default_options+1] = "single_ecdh_use";
+	core_defaults.options[#core_defaults.options+1] = "single_dh_use";
+	core_defaults.options[#core_defaults.options+1] = "single_ecdh_use";
 	if configmanager.get("*", "ssl_compression") ~= true then
 		core_defaults.options[#core_defaults.options+1] = "no_compression";
 	end
prosody