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 9DF8CD112 for ; Thu, 8 Nov 2012 22:44:12 +0000 (UTC) Received: (qmail 76548 invoked by uid 500); 8 Nov 2012 22:44:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 76177 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 76040 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 23D2145CA4; 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: [1/15] git commit: max age is already configurable, remove TODO item Message-Id: <20121108224411.23D2145CA4@tyr.zones.apache.org> Date: Thu, 8 Nov 2012 22:44:11 +0000 (UTC) Updated Branches: refs/heads/431-feature_cors 789d26c9e -> 547ead072 max age is already configurable, remove TODO item Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f35e5374 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f35e5374 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f35e5374 Branch: refs/heads/431-feature_cors Commit: f35e5374884bb506d64e4e26aee994da24b176c9 Parents: 07ed30f Author: Jan Lehnardt Authored: Thu Nov 8 22:51:06 2012 +0100 Committer: Jan Lehnardt Committed: Thu Nov 8 23:37:34 2012 +0100 ---------------------------------------------------------------------- src/couchdb/couch_httpd_cors.erl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f35e5374/src/couchdb/couch_httpd_cors.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl index c3caa5c..d7ffe2d 100644 --- a/src/couchdb/couch_httpd_cors.erl +++ b/src/couchdb/couch_httpd_cors.erl @@ -31,7 +31,6 @@ "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' ->