diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:37:13 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-11-09 18:37:13 +0000 |
| commit | 36c5b9e1e93fc4966b323dfb09d97ecf58b16eda (patch) | |
| tree | e3dab93899e69c3342f06ebd3ef65bda4c11915d | |
| parent | c6d12b1a102ee760b7d5a567e3346124589e29e3 (diff) | |
| parent | 85289e8c7d1f592a65ba13d1c117d34cefc6e3ad (diff) | |
| download | prosody-36c5b9e1e93fc4966b323dfb09d97ecf58b16eda.tar.gz prosody-36c5b9e1e93fc4966b323dfb09d97ecf58b16eda.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/certmanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 |
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 |