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 7894ED10F for ; Thu, 8 Nov 2012 22:44:12 +0000 (UTC) Received: (qmail 76211 invoked by uid 500); 8 Nov 2012 22:44:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 76063 invoked by uid 500); 8 Nov 2012 22:44:11 -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 76011 invoked by uid 99); 8 Nov 2012 22:44:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 22:44:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A12945CA6; Thu, 8 Nov 2012 22:44:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/15] git commit: Whitespace formatting Message-Id: <20121108224411.2A12945CA6@tyr.zones.apache.org> Date: Thu, 8 Nov 2012 22:44:11 +0000 (UTC) Whitespace formatting Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7f4122dc Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7f4122dc Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7f4122dc Branch: refs/heads/431-feature_cors Commit: 7f4122dcaac3bbe2c42a05a9b5ae7c1c1bd78371 Parents: 0a4cd90 Author: Jan Lehnardt Authored: Thu Nov 8 22:34:41 2012 +0100 Committer: Jan Lehnardt Committed: Thu Nov 8 23:37:34 2012 +0100 ---------------------------------------------------------------------- src/couchdb/couch_httpd_cors.erl | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7f4122dc/src/couchdb/couch_httpd_cors.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl index 96abbe6..6c3989a 100644 --- a/src/couchdb/couch_httpd_cors.erl +++ b/src/couchdb/couch_httpd_cors.erl @@ -189,11 +189,8 @@ send_preflight_response(#httpd{mochi_req=MochiReq}=Req, Headers) -> credentials("*", _Host) -> false; credentials(_Origin, Host) -> - Default = get_bool_config("cors", "credentials", - false), - - get_bool_config(cors_section(Host), "credentials", - Default). + Default = get_bool_config("cors", "credentials", false), + get_bool_config(cors_section(Host), "credentials", Default). cors_config(Host, Key, Default) ->