# HG changeset patch # User Matthew Wild # Date 1384022192 0 # Node ID c1bc2c20a80a82498c3796421b6a3a3693045a7e # Parent 0e0aab930e10451f2a937ec36cb5b235082357a5# Parent c11c0761a6822493a379a6f55555c566fd8dcc04 Merge 0.9->0.10 diff -r 0e0aab930e10 -r c1bc2c20a80a core/certmanager.lua --- a/core/certmanager.lua Thu Nov 07 17:18:20 2013 +0100 +++ b/core/certmanager.lua Sat Nov 09 18:36:32 2013 +0000 @@ -37,7 +37,7 @@ capath = "/etc/ssl/certs"; protocol = "sslv23"; verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none"; - options = { "no_sslv2", "no_sslv3", luasec_has_noticket and "no_ticket" or nil }; + options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil }; verifyext = { "lsec_continue", "lsec_ignore_purpose" }; curve = "secp384r1"; ciphers = "HIGH:!DSS:!aNULL@STRENGTH";