You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fd...@apache.org on 2011/11/01 12:57:22 UTC
git commit: Fix handling of SSL option verify_ssl_certificates
Updated Branches:
refs/heads/master 092d04f66 -> 4a0d87dfa
Fix handling of SSL option verify_ssl_certificates
If this parameter was set to false in the .ini config, Couch
would still complain with following error message:
"Verify SSL certificate enabled but file containing PEM encoded
CA certificates is missing"
Closes COUCHDB-1325.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4a0d87df
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4a0d87df
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4a0d87df
Branch: refs/heads/master
Commit: 4a0d87dfacd7b536f460f1fbc62947db3d4c38b7
Parents: 092d04f
Author: Filipe David Manana <fd...@apache.org>
Authored: Tue Nov 1 11:49:05 2011 +0000
Committer: Filipe David Manana <fd...@apache.org>
Committed: Tue Nov 1 11:57:09 2011 +0000
----------------------------------------------------------------------
src/couchdb/couch_httpd.erl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4a0d87df/src/couchdb/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 16b9577..5b5a8b6 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -52,9 +52,9 @@ start_link(https) ->
end,
% do we verify certificates ?
FinalSslOpts = case couch_config:get("ssl",
- "verify_ssl_certificates", false) of
- false -> SslOpts1;
- _ ->
+ "verify_ssl_certificates", "false") of
+ "false" -> SslOpts1;
+ "true" ->
case couch_config:get("ssl",
"cacert_file", nil) of
nil ->