diff options
| author | Kim Alvefur <zash@zash.se> | 2013-10-15 10:48:11 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-10-15 10:48:11 +0200 |
| commit | f3eea8785c0b018fafb3f06fb507d079bf7c5aae (patch) | |
| tree | fe9b8ddc6deba4135441975ae2d3f6af34d7248a /core | |
| parent | 66da3ac69a0c272a954278914cd7c4d7061bc344 (diff) | |
| parent | ddab3471659587368ae35104de4d62776484352a (diff) | |
| download | prosody-f3eea8785c0b018fafb3f06fb507d079bf7c5aae.tar.gz prosody-f3eea8785c0b018fafb3f06fb507d079bf7c5aae.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/certmanager.lua | 4 |
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 |