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 692E7D8A6 for ; Fri, 2 Nov 2012 13:10:41 +0000 (UTC) Received: (qmail 86198 invoked by uid 500); 2 Nov 2012 13:10:41 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 86078 invoked by uid 500); 2 Nov 2012 13:10:40 -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 86067 invoked by uid 99); 2 Nov 2012 13:10:39 -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, 02 Nov 2012 13:10:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ADA9651E23; Fri, 2 Nov 2012 13:10:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dch@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: align default.ini enable_cors flag to match src/couchdb/couch_httpd_cors.erl Message-Id: <20121102131039.ADA9651E23@tyr.zones.apache.org> Date: Fri, 2 Nov 2012 13:10:39 +0000 (UTC) Updated Branches: refs/heads/431-feature_cors 915c811a0 -> e70e4faa9 align default.ini enable_cors flag to match src/couchdb/couch_httpd_cors.erl Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e70e4faa Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e70e4faa Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e70e4faa Branch: refs/heads/431-feature_cors Commit: e70e4faa9f8ca7b87b0d35db2907f57c84ef4062 Parents: 915c811 Author: Dave Cottlehuber Authored: Fri Nov 2 14:08:35 2012 +0100 Committer: Dave Cottlehuber Committed: Fri Nov 2 14:08:35 2012 +0100 ---------------------------------------------------------------------- etc/couchdb/default.ini.tpl.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/e70e4faa/etc/couchdb/default.ini.tpl.in ---------------------------------------------------------------------- diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index 01ae4d9..272af74 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -49,7 +49,7 @@ allow_jsonp = false ; For more socket options, consult Erlang's module 'inet' man page. ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] log_max_chunk_size = 1000000 -cors_enable = false +enable_cors = false [ssl] port = 6984