You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2016/09/27 15:52:29 UTC
chttpd commit: updated refs/heads/master to f1d0c5d
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master ff59604e3 -> f1d0c5dc8
Fix SSL defaults
Three properties had their defaults changed to a value that
couch_util:parse_terms throws up on.
"nil" was changed to undefined in COUCHDB-2561 as part of normalising
the config API. The change from list to atom was a mistake.
COUCHDB-3162
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/f1d0c5dc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/f1d0c5dc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/f1d0c5dc
Branch: refs/heads/master
Commit: f1d0c5dc8e9ea8c639d39ff63001f3925d6786e8
Parents: ff59604
Author: Robert Newson <rn...@apache.org>
Authored: Tue Sep 27 16:15:44 2016 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Sep 27 16:15:44 2016 +0100
----------------------------------------------------------------------
src/chttpd.erl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/f1d0c5dc/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index c446eac..d55aa5e 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -61,9 +61,9 @@ start_link(http) ->
start_link(https) ->
Port = config:get("ssl", "port", "6984"),
- {ok, Ciphers} = couch_util:parse_term(config:get("ssl", "ciphers", undefined)),
- {ok, Versions} = couch_util:parse_term(config:get("ssl", "tls_versions", undefined)),
- {ok, SecureRenegotiate} = couch_util:parse_term(config:get("ssl", "secure_renegotiate", undefined)),
+ {ok, Ciphers} = couch_util:parse_term(config:get("ssl", "ciphers", "undefined")),
+ {ok, Versions} = couch_util:parse_term(config:get("ssl", "tls_versions", "undefined")),
+ {ok, SecureRenegotiate} = couch_util:parse_term(config:get("ssl", "secure_renegotiate", "undefined")),
ServerOpts0 =
[{cacertfile, config:get("ssl", "cacert_file", undefined)},
{keyfile, config:get("ssl", "key_file", undefined)},