aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-22 14:33:18 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-22 14:33:18 +0100
commitc8d21f63aec906c72eb2e97ded9e8459a93fac56 (patch)
treecad2cfc2b92d19767b0aeef7752b85b54623d09d /core
parenta8da45a1b9aca9dae8e2d9ceeb491815716df340 (diff)
parent840cf714cfef934759c0a1dfffda1d5fc5b2d2f5 (diff)
downloadprosody-c8d21f63aec906c72eb2e97ded9e8459a93fac56.tar.gz
prosody-c8d21f63aec906c72eb2e97ded9e8459a93fac56.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index b91f7110..49f445f6 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -17,11 +17,12 @@ local prosody = prosody;
local resolve_path = configmanager.resolve_relative_path;
local config_path = prosody.paths.config;
-local luasec_has_noticket, luasec_has_verifyext;
+local luasec_has_noticket, luasec_has_verifyext, luasec_has_no_compression;
if ssl then
local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
luasec_has_noticket = tonumber(luasec_major)>0 or tonumber(luasec_minor)>=4;
luasec_has_verifyext = tonumber(luasec_major)>0 or tonumber(luasec_minor)>=5;
+ luasec_has_no_compression = tonumber(luasec_major)>0 or tonumber(luasec_minor)>=5;
end
module "certmanager"
@@ -39,6 +40,9 @@ if ssl and not luasec_has_verifyext and ssl.x509 then
default_verify[#default_verify+1] = default_verifyext[i]:sub(6);
end
end
+if luasec_has_no_compression and configmanager.get("*", "ssl_compression") ~= true then
+ default_options[#default_options+1] = "no_compression";
+end
function create_context(host, mode, user_ssl_config)
user_ssl_config = user_ssl_config or default_ssl_config;