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 1ABF017832 for ; Fri, 7 Nov 2014 22:01:02 +0000 (UTC) Received: (qmail 96148 invoked by uid 500); 7 Nov 2014 22:01:02 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 95970 invoked by uid 500); 7 Nov 2014 22:01:02 -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 95954 invoked by uid 99); 7 Nov 2014 22:01:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 22:01:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A327199DD2B; Fri, 7 Nov 2014 22:01:01 +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: Fri, 07 Nov 2014 22:01:02 -0000 Message-Id: In-Reply-To: <16931ca98fa24eaab687c0c1a1ea5ca5@git.apache.org> References: <16931ca98fa24eaab687c0c1a1ea5ca5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] chttpd commit: updated refs/heads/2080-port-cors to 7ac7cc0 Disable couch_httpd_cors when chttpd_cors is active Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/7ac7cc06 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/7ac7cc06 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/7ac7cc06 Branch: refs/heads/2080-port-cors Commit: 7ac7cc06fb6fb8bc090ae50c0ee7c1e2f4e847d2 Parents: cf7873d Author: Russell Branca Authored: Thu Nov 6 14:48:51 2014 -0800 Committer: Russell Branca Committed: Fri Nov 7 13:56:31 2014 -0800 ---------------------------------------------------------------------- src/chttpd_cors.erl | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/7ac7cc06/src/chttpd_cors.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_cors.erl b/src/chttpd_cors.erl index e5c1f28..5b705bc 100644 --- a/src/chttpd_cors.erl +++ b/src/chttpd_cors.erl @@ -286,6 +286,12 @@ get_cors_config(_Req) -> is_cors_enabled(Config) -> + case get(disable_couch_httpd_cors) of + undefined -> + put(disable_couch_httpd_cors, true); + _ -> + ok + end, couch_util:get_value(<<"enable_cors">>, Config, false).