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 35CC718402 for ; Tue, 2 Feb 2016 15:23:35 +0000 (UTC) Received: (qmail 92465 invoked by uid 500); 2 Feb 2016 15:23:23 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 92400 invoked by uid 500); 2 Feb 2016 15:23:23 -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 92387 invoked by uid 99); 2 Feb 2016 15:23:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2016 15:23:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 867ECDFCDD; Tue, 2 Feb 2016 15:23:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Date: Tue, 02 Feb 2016 15:23:23 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/6] chttpd commit: updated refs/heads/master to 41ac33a Repository: couchdb-chttpd Updated Branches: refs/heads/master 6a2a6b976 -> 41ac33a08 Use correct setting for AllowHeaders Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/9733d21a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/9733d21a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/9733d21a Branch: refs/heads/master Commit: 9733d21ac223fbe92fc94405ef9d33c919aaa8ad Parents: ddba207 Author: ILYA Khlopotov Authored: Mon Jan 25 13:04:06 2016 -0800 Committer: ILYA Khlopotov Committed: Mon Jan 25 13:04:06 2016 -0800 ---------------------------------------------------------------------- src/chttpd_cors.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/9733d21a/src/chttpd_cors.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_cors.erl b/src/chttpd_cors.erl index 525fc5f..b7031e5 100644 --- a/src/chttpd_cors.erl +++ b/src/chttpd_cors.erl @@ -268,7 +268,7 @@ allow_credentials(Config, Origin) -> get_cors_config(#httpd{cors_config = undefined}) -> EnableCors = config:get("httpd", "enable_cors", "false") =:= "true", AllowCredentials = config:get("cors", "credentials", "false") =:= "true", - AllowHeaders = case config:get("cors", "methods", undefined) of + AllowHeaders = case config:get("cors", "headers", undefined) of undefined -> ?SUPPORTED_HEADERS; AllowHeaders0 ->