aboutsummaryrefslogtreecommitdiffstats
path: root/core/certmanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-15 10:48:11 +0200
committerKim Alvefur <zash@zash.se>2013-10-15 10:48:11 +0200
commit75aefae1a9bf676ddf59d571ba0e55098298509f (patch)
treefe9b8ddc6deba4135441975ae2d3f6af34d7248a /core/certmanager.lua
parent243b96a44040e06cc7164d6fe96b48da8ae23388 (diff)
parent4c2ea20af4ca9ea1136a83863bd9b7d2a8469f3f (diff)
downloadprosody-75aefae1a9bf676ddf59d571ba0e55098298509f.tar.gz
prosody-75aefae1a9bf676ddf59d571ba0e55098298509f.zip
Merge 0.10->trunk
Diffstat (limited to 'core/certmanager.lua')
-rw-r--r--core/certmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 0709c650..e8030581 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -54,8 +54,8 @@ if ssl and not luasec_has_verifyext and ssl.x509 then
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