Software / code / prosody
Diff
core/certmanager.lua @ 5873:4669bd7038c7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Oct 2013 01:38:02 +0200 |
| parent | 5872:1c3ebd3009fe |
| child | 5874:3321a4b3e6c4 |
line wrap: on
line diff
--- a/core/certmanager.lua Thu Oct 10 22:27:01 2013 +0100 +++ b/core/certmanager.lua Tue Oct 15 01:38:02 2013 +0200 @@ -53,8 +53,12 @@ end end -if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then - core_defaults.options[#core_defaults.options+1] = "no_compression"; +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"; + if configmanager.get("*", "ssl_compression") ~= true then + core_defaults.options[#core_defaults.options+1] = "no_compression"; + end end function create_context(host, mode, user_ssl_config)
