Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 09 Nov 2013 18:37:13 +0000
changeset 5905 91b48772b27b
parent 5900 cb1103423aa7 (current diff)
parent 5904 c1bc2c20a80a (diff)
child 5909 d6b3891f186c
Merge 0.10->trunk
--- 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";
--- a/plugins/mod_storage_sql2.lua	Wed Nov 06 14:38:51 2013 -0500
+++ b/plugins/mod_storage_sql2.lua	Sat Nov 09 18:37:13 2013 +0000
@@ -239,7 +239,7 @@
 		if query.start then
 			where[#where] = "`when` BETWEEN ? AND ?" -- is this inclusive?
 		else
-			where[#where+1] = "`when` >= ?"
+			where[#where+1] = "`when` <= ?"
 		end
 	end