Diff

core/certmanager.lua @ 5905:91b48772b27b

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 09 Nov 2013 18:37:13 +0000
parent 5904:c1bc2c20a80a
child 5908:081a91507e4f
line wrap: on
line diff
--- a/core/certmanager.lua	Wed Nov 06 14:38:51 2013 -0500
+++ b/core/certmanager.lua	Sat Nov 09 18:37:13 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";