Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Sat, 09 Nov 2013 18:36:32 +0000
changeset 5904 c1bc2c20a80a
parent 5903 0e0aab930e10 (current diff)
parent 5902 c11c0761a682 (diff)
child 5905 91b48772b27b
child 5908 081a91507e4f
Merge 0.9->0.10
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";