couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [5/9] chttpd commit: updated refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed to 002a908
Date Wed, 28 May 2014 22:45:11 GMT
Support for user configurable SSL ciphers


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

Branch: refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed
Commit: c27884bf37404d45d921740d8914e576fa6c78b0
Parents: 009fa9a
Author: Robert Newson <rnewson@apache.org>
Authored: Thu May 22 12:10:51 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Thu May 22 12:13:14 2014 +0100

----------------------------------------------------------------------
 src/chttpd.erl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/c27884bf/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 8a70707..fb9a94d 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -50,11 +50,17 @@ start_link(http) ->
 
 start_link(https) ->
     Port = config:get("ssl", "port", "6984"),
+    {ok, Ciphers} = couch_util:parse_term(config:get("ssl", "ciphers", "nil")),
+    {ok, Versions} = couch_util:parse_term(config:get("ssl", "tls_versions", "nil")),
+    {ok, SecureRenegotiate} = couch_util:parse_term(config:get("ssl", "secure_renegotiate",
"nil")),
     ServerOpts0 =
         [{cacertfile, config:get("ssl", "cacert_file", nil)},
          {keyfile, config:get("ssl", "key_file", nil)},
          {certfile, config:get("ssl", "cert_file", nil)},
-         {password, config:get("ssl", "password", nil)}],
+         {password, config:get("ssl", "password", nil)},
+         {secure_renegotiate, SecureRenegotiate},
+         {versions, Versions},
+         {ciphers, Ciphers}],
 
     case (couch_util:get_value(keyfile, ServerOpts0) == nil orelse
         couch_util:get_value(certfile, ServerOpts0) == nil) of


Mime
View raw message