You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fd...@apache.org on 2011/01/03 21:43:12 UTC
svn commit: r1054741 - in /couchdb/branches/1.1.x:
etc/couchdb/default.ini.tpl.in src/couchdb/couch_httpd.erl
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", _) ->