Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 27980 invoked from network); 3 Jan 2011 20:43:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Jan 2011 20:43:35 -0000 Received: (qmail 51451 invoked by uid 500); 3 Jan 2011 20:43:35 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 51402 invoked by uid 500); 3 Jan 2011 20:43:35 -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 51389 invoked by uid 99); 3 Jan 2011 20:43:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jan 2011 20:43:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jan 2011 20:43:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B035323889B2; Mon, 3 Jan 2011 20:43:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1054741 - in /couchdb/branches/1.1.x: etc/couchdb/default.ini.tpl.in src/couchdb/couch_httpd.erl Date: Mon, 03 Jan 2011 20:43:12 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110103204312.B035323889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Mon Jan 3 20:43:12 2011 New Revision: 1054741 URL: http://svn.apache.org/viewvc?rev=1054741&view=rev Log: Merged revision 1054740 from trunk Removed references to no longer used config parameters Closes COUCHDB-1007 Modified: couchdb/branches/1.1.x/etc/couchdb/default.ini.tpl.in couchdb/branches/1.1.x/src/couchdb/couch_httpd.erl Modified: couchdb/branches/1.1.x/etc/couchdb/default.ini.tpl.in URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/etc/couchdb/default.ini.tpl.in?rev=1054741&r1=1054740&r2=1054741&view=diff ============================================================================== --- couchdb/branches/1.1.x/etc/couchdb/default.ini.tpl.in (original) +++ couchdb/branches/1.1.x/etc/couchdb/default.ini.tpl.in Mon Jan 3 20:43:12 2011 @@ -7,7 +7,6 @@ database_dir = %localstatelibdir% view_index_dir = %localstatelibdir% util_driver_dir = %couchprivlibdir% max_document_size = 4294967296 ; 4 GB -max_attachment_chunk_size = 4294967296 ; 4GB os_process_timeout = 5000 ; 5 seconds. for view and external servers. max_dbs_open = 100 delayed_commits = true ; set this to false to ensure an fsync before 201 Created is returned @@ -16,7 +15,6 @@ uri_file = %localstaterundir%/couch.uri [httpd] port = 5984 bind_address = 127.0.0.1 -max_connections = 2048 authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler} default_handler = {couch_httpd_db, handle_request} secure_rewrites = true Modified: couchdb/branches/1.1.x/src/couchdb/couch_httpd.erl URL: http://svn.apache.org/viewvc/couchdb/branches/1.1.x/src/couchdb/couch_httpd.erl?rev=1054741&r1=1054740&r2=1054741&view=diff ============================================================================== --- couchdb/branches/1.1.x/src/couchdb/couch_httpd.erl (original) +++ couchdb/branches/1.1.x/src/couchdb/couch_httpd.erl Mon Jan 3 20:43:12 2011 @@ -107,8 +107,6 @@ start_link(Name, Options) -> ?MODULE:stop(); ("httpd", "port") -> ?MODULE:stop(); - ("httpd", "max_connections") -> - ?MODULE:stop(); ("httpd", "default_handler") -> ?MODULE:stop(); ("httpd_global_handlers", _) ->