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 279DC10EAB for ; Wed, 28 May 2014 22:45:08 +0000 (UTC) Received: (qmail 95887 invoked by uid 500); 28 May 2014 22:45:08 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 95737 invoked by uid 500); 28 May 2014 22:45:08 -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 95557 invoked by uid 99); 28 May 2014 22:45:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2014 22:45:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B1C3F4E8EB; Wed, 28 May 2014 22:45:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Wed, 28 May 2014 22:45:10 -0000 Message-Id: <5f8bdb977c994c33a48a23fcd523a11e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/9] chttpd commit: updated refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed to 002a908 Support `fail_if_no_peer_cert` ssl option Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/7c7c19ff Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/7c7c19ff Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/7c7c19ff Branch: refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed Commit: 7c7c19ff628929417c37cb26b91a40c388c57dec Parents: c27884b Author: Robert Newson Authored: Thu May 22 12:11:29 2014 +0100 Committer: Robert Newson Committed: Thu May 22 12:13:14 2014 +0100 ---------------------------------------------------------------------- src/chttpd.erl | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/7c7c19ff/src/chttpd.erl ---------------------------------------------------------------------- diff --git a/src/chttpd.erl b/src/chttpd.erl index fb9a94d..8618811 100644 --- a/src/chttpd.erl +++ b/src/chttpd.erl @@ -77,8 +77,13 @@ start_link(https) -> "false" -> []; "true" -> + FailIfNoPeerCert = case config:get("ssl", "fail_if_no_peer_cert", "false") of + "false" -> false; + "true" -> true + end, [{depth, list_to_integer(config:get("ssl", "ssl_certificate_max_depth", "1"))}, + {fail_if_no_peer_cert, FailIfNoPeerCert}, {verify, verify_peer}] ++ case config:get("ssl", "verify_fun", nil) of nil -> [];