You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/08/06 17:49:27 UTC
[couchdb-documentation] branch master updated: Changes to match
apache/couchdb#1411
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
The following commit(s) were added to refs/heads/master by this push:
new 8988c40 Changes to match apache/couchdb#1411
8988c40 is described below
commit 8988c40261cd98be545238d5e3a4b0bfcacebd77
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Mon Aug 6 12:27:58 2018 -0400
Changes to match apache/couchdb#1411
---
src/api/server/configuration.rst | 3 ++-
src/config/http.rst | 20 +++++++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/api/server/configuration.rst b/src/api/server/configuration.rst
index f3d63db..248f6eb 100644
--- a/src/api/server/configuration.rst
+++ b/src/api/server/configuration.rst
@@ -84,7 +84,8 @@ interact with the local node's configuration.
"docroot": "./share/www",
"port": "5984",
"require_valid_user": "false",
- "socket_options": "[{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]"
+ "socket_options": "[{sndbuf, 262144}, {nodelay, true}]",
+ "server_options": "[{recbuf, undefined}]"
},
"daemons": {
"auth_cache": "{couch_auth_cache, start_link, []}",
diff --git a/src/config/http.rst b/src/config/http.rst
index 80c0cfb..b8c1879 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -201,11 +201,25 @@ HTTP Server Options
.. config:option:: socket_options :: Socket Options
- The socket options for the listening socket in CouchDB can be specified
- as a list of tuples. For example::
+ The socket options for the listening socket in CouchDB, as set at the
+ beginning of ever request, can be specified as a list of tuples. For example::
[httpd]
- socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+ socket_options = [{sndbuf, 262144}, {nodelay, true}]
+
+ The options supported are a subset of full options supported by the
+ TCP/IP stack. A list of the supported options are provided in the
+ `Erlang inet`_ documentation.
+
+ .. _Erlang inet: http://www.erlang.org/doc/man/inet.html#setopts-2
+
+ .. config:option:: server_options :: Socket Options
+
+ The server options for any socket in the mochiweb acceptor pool in CouchDB
+ can be specified as a list of tuples. For example::
+
+ [httpd]
+ server_options = [{recbuf, undefined}]
The options supported are a subset of full options supported by the
TCP/IP stack. A list of the supported options are provided in the