aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-09 18:37:13 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-09 18:37:13 +0000
commita15849cf9ac371f9c328702a0129b4f1c63b1f90 (patch)
treee3dab93899e69c3342f06ebd3ef65bda4c11915d
parent37895d0d715ca071bc1c79554935074bbec3dd1c (diff)
parent3186d24c03e4d940aabe4619ec0b661fb27ad11d (diff)
downloadprosody-a15849cf9ac371f9c328702a0129b4f1c63b1f90.tar.gz
prosody-a15849cf9ac371f9c328702a0129b4f1c63b1f90.zip
Merge 0.10->trunk
-rw-r--r--core/certmanager.lua2
-rw-r--r--plugins/mod_storage_sql2.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index dc22bb46..d9d722f3 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -37,7 +37,7 @@ local core_defaults = {
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";
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 9b365a1e..824ab859 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -239,7 +239,7 @@ local function archive_where(query, args, where)
if query.start then
where[#where] = "`when` BETWEEN ? AND ?" -- is this inclusive?
else
- where[#where+1] = "`when` >= ?"
+ where[#where+1] = "`when` <= ?"
end
end