From 9f0ae92b4f4c0762214092cf8d50675d01c847ab Mon Sep 17 00:00:00 2001 From: Filipe David Borba Manana Date: Tue, 1 Feb 2011 06:47:32 +0000 Subject: Backport COUCHDB-1008 from trunk (revision 1055592) The motivation for this backport is to prevent the "nodelay" option, under section "httpd", from reaching version 1.1. This patch introduces the "socket_options" configuration parameter which is more generic - it allows nodelay as well as other socket options to be specified. Not adding this patch to 1.1.x would imply still supporting the "nodelay" parameter in future releases to avoid breaking the configuration API. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1065922 13f79535-47bb-0310-9956-ffa450edef68 --- etc/couchdb/default.ini.tpl.in | 4 ++++ etc/couchdb/local.ini | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'etc') diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index e8a69f77..882ca4f6 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -20,6 +20,10 @@ default_handler = {couch_httpd_db, handle_request} secure_rewrites = true vhost_global_handlers = _utils, _uuids, _session, _oauth, _users allow_jsonp = false +; Options for the MochiWeb HTTP server. +;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] +; For more socket options, consult Erlang's module 'inet' man page. +;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] [ssl] port = 6984 diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini index 1c4060ab..33380a32 100644 --- a/etc/couchdb/local.ini +++ b/etc/couchdb/local.ini @@ -10,6 +10,11 @@ [httpd] ;port = 5984 ;bind_address = 127.0.0.1 +; Options for the MochiWeb HTTP server. +;server_options = [{backlog, 128}, {acceptor_pool_size, 16}] +; For more socket options, consult Erlang's module 'inet' man page. +;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] + ; Uncomment next line to trigger basic-auth popup on unauthorized requests. ;WWW-Authenticate = Basic realm="administrator" -- cgit v1.2.3