Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D2F3172A8 for ; Fri, 31 Oct 2014 02:41:59 +0000 (UTC) Received: (qmail 35489 invoked by uid 500); 31 Oct 2014 02:41:58 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 35436 invoked by uid 500); 31 Oct 2014 02:41:58 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 35427 invoked by uid 99); 31 Oct 2014 02:41:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2014 02:41:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8AAFCA05ACF; Fri, 31 Oct 2014 02:41:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Message-Id: <099eed6283db43cd94126df1e05983ba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/1.x.x to b1f5333 Date: Fri, 31 Oct 2014 02:41:58 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/1.x.x f30f3dd2a -> b1f5333b9 docs: add version tag for f30f3dd feature Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b1f5333b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b1f5333b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b1f5333b Branch: refs/heads/1.x.x Commit: b1f5333b9057a3b784704022d999e9a969935b26 Parents: f30f3dd Author: Alexander Shorin Authored: Fri Oct 31 05:40:44 2014 +0300 Committer: Alexander Shorin Committed: Fri Oct 31 05:40:44 2014 +0300 ---------------------------------------------------------------------- share/doc/src/config/http.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b1f5333b/share/doc/src/config/http.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/config/http.rst b/share/doc/src/config/http.rst index 3b808e9..6ab09f0 100644 --- a/share/doc/src/config/http.rst +++ b/share/doc/src/config/http.rst @@ -401,11 +401,13 @@ Secure Socket Level Options Set to the cipher suites that should be supported which can be specified in erlang format "{ecdhe_ecdsa,aes_128_cbc,sha256}" or - in OpenSSL format "ECDHE-ECDSA-AES128-SHA256". + in OpenSSL format "ECDHE-ECDSA-AES128-SHA256":: [ssl] ciphers = ["ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA"] + .. versionadded:: 1.7 + .. config:option:: tls_versions :: Specify permitted server SSL/TLS protocol versions @@ -414,6 +416,8 @@ Secure Socket Level Options [ssl] tls_versions = [sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2'] + .. versionadded:: 1.7 + .. _cors: .. _config/cors: