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 C9DC8D10E for ; Thu, 8 Nov 2012 22:44:11 +0000 (UTC) Received: (qmail 76097 invoked by uid 500); 8 Nov 2012 22:44:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 76055 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 76025 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 3A91C45CAC; 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: [5/15] git commit: create constant for default max age value Message-Id: <20121108224411.3A91C45CAC@tyr.zones.apache.org> Date: Thu, 8 Nov 2012 22:44:11 +0000 (UTC) create constant for default max age value Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0a4cd903 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0a4cd903 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0a4cd903 Branch: refs/heads/431-feature_cors Commit: 0a4cd90337b30c93a0506be918154d74645f16b5 Parents: 2709554 Author: Jan Lehnardt Authored: Thu Nov 8 22:34:31 2012 +0100 Committer: Jan Lehnardt Committed: Thu Nov 8 23:37:34 2012 +0100 ---------------------------------------------------------------------- src/couchdb/couch_httpd_cors.erl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a4cd903/src/couchdb/couch_httpd_cors.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl index ad949ff..96abbe6 100644 --- a/src/couchdb/couch_httpd_cors.erl +++ b/src/couchdb/couch_httpd_cors.erl @@ -30,6 +30,10 @@ -define(SUPPORTED_METHODS, "GET, HEAD, POST, PUT, DELETE," ++ "TRACE, CONNECT, COPY, OPTIONS"). +% TODO: - pick a sane default +% - make configurable +-define(CORS_DEFAULT_MAX_AGE, 12345). + is_preflight_request(#httpd{method=Method}=Req) when Method /= 'OPTIONS' -> Req; is_preflight_request(Req) -> @@ -122,7 +126,7 @@ handle_preflight_request(Origin, Host, MochiReq) -> SupportedHeaders = [string:to_lower(H) || H <- AllSupportedHeaders], % get max age - MaxAge = cors_config(Host, "max_age", "12345"), + MaxAge = cors_config(Host, "max_age", ?CORS_DEFAULT_MAX_AGE), PreflightHeaders0 = case credentials(Origin, Host) of true ->