couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject git commit: Fix handling of SSL option verify_ssl_certificates
Date Tue, 01 Nov 2011 11:58:04 GMT
Updated Branches:
  refs/heads/1.2.x 25d0fcc1e -> 7ae56aee0


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/7ae56aee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7ae56aee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7ae56aee

Branch: refs/heads/1.2.x
Commit: 7ae56aee03b056c12dcb21e8bdc303cb3d9a554a
Parents: 25d0fcc
Author: Filipe David Manana <fdmanana@apache.org>
Authored: Tue Nov 1 11:49:05 2011 +0000
Committer: Filipe David Manana <fdmanana@apache.org>
Committed: Tue Nov 1 11:57:46 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/7ae56aee/src/couchdb/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 3af6b1d..11b0bca 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -51,9 +51,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 ->


Mime
View raw message