couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject couchdb commit: updated refs/heads/1.x.x to 3996b5f
Date Thu, 27 Nov 2014 16:42:02 GMT
Repository: couchdb
Updated Branches:
  refs/heads/1.x.x 1545bf424 -> 3996b5f17


Remove sslv3 from example local.ini file and docs


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3996b5f1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3996b5f1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3996b5f1

Branch: refs/heads/1.x.x
Commit: 3996b5f173a70ccb61d9781b88c0b2b5bd2a67ce
Parents: 1545bf4
Author: Alexander Shorin <kxepal@apache.org>
Authored: Thu Nov 27 19:41:29 2014 +0300
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Thu Nov 27 19:41:29 2014 +0300

----------------------------------------------------------------------
 etc/couchdb/local.ini         | 2 +-
 share/doc/src/config/http.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3996b5f1/etc/couchdb/local.ini
----------------------------------------------------------------------
diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini
index b102881..5395668 100644
--- a/etc/couchdb/local.ini
+++ b/etc/couchdb/local.ini
@@ -83,7 +83,7 @@ ssl_certificate_max_depth = 1
 ; or in OpenSSL format "ECDHE-ECDSA-AES128-SHA256".
 ;ciphers = ["ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA"]
 ; The SSL/TLS versions to support
-;tls_versions = [sslv3, tlsv1, 'tlsv1.1', 'tlsv1.2']
+;tls_versions = [tlsv1, 'tlsv1.1', 'tlsv1.2']
 
 ; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to
 ; the Virual Host will be redirected to the path. In the example below all requests

http://git-wip-us.apache.org/repos/asf/couchdb/blob/3996b5f1/share/doc/src/config/http.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/http.rst b/share/doc/src/config/http.rst
index 4834f38..6854a24 100644
--- a/share/doc/src/config/http.rst
+++ b/share/doc/src/config/http.rst
@@ -416,7 +416,7 @@ Secure Socket Level Options
     Set to a list of permitted SSL/TLS protocol versions::
 
       [ssl]
-      tls_versions = [sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2']
+      tls_versions = [tlsv1 | 'tlsv1.1' | 'tlsv1.2']
 
     .. versionadded:: 1.7
 


Mime
View raw message