diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-01-03 20:43:12 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-01-03 20:43:12 +0000 |
| commit | 11d6e62c77b8721eb6f67e35b23f2f48acce1ae7 (patch) | |
| tree | 36a9e8961c689631a44d4f40f3149835417e525d | |
| parent | 84bf6fc0bbb888c76a435294d773d62c6e1dacd8 (diff) | |
Merged revision 1054740 from trunk
Removed references to no longer used config parameters
Closes COUCHDB-1007
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1054741 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd.erl | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index 13e0eee7..7ed548de 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -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 diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl index 6bd5c893..eb553c27 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -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", _) -> |