[couchdb] 01/01: Use new mochiweb recbuf|sndbuf undefined setting

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch 1409-recbuf-sndbuf-undefined
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit d9f65878020a87bfc6e13fc19f3b8a7d535f5c2c
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Mon Jun 25 12:29:48 2018 -0400

    Use new mochiweb recbuf|sndbuf undefined setting
    
    Fixes #1409
---
 rel/overlay/etc/default.ini | 8 ++++----
 rel/overlay/etc/local.ini   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 8b47cb0..7a48324 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -83,7 +83,7 @@ port = {{cluster_port}}
 bind_address = 127.0.0.1
 backlog = 512
 docroot = {{fauxton_root}}
-socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+socket_options = [{recbuf, undefined}, {sndbuf, 262144}, {nodelay, true}]
 require_valid_user = false
 ; List of headers that will be kept when the header Prefer: return=minimal is included in a request.
 ; If Server header is left out, Mochiweb will add its own one in.
@@ -130,8 +130,8 @@ 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}]
-socket_options = [{recbuf, 262144}, {sndbuf, 262144}]
+;socket_options = [{recbuf, undefined}, {sndbuf, 262144}, {nodelay, true}]
+socket_options = [{recbuf, undefined}, {sndbuf, 262144}]
 enable_cors = false
 enable_xframe_options = false
 ; CouchDB can optionally enforce a maximum uri length;
@@ -408,7 +408,7 @@ retries_per_request = 5
 ; Some socket options that might boost performance in some scenarios:
 ;       {nodelay, boolean()}
 ;       {sndbuf, integer()}
-;       {recbuf, integer()}
+;       {recbuf, integer()|undefined}
 ;       {priority, integer()}
 ; See the `inet` Erlang module's man page for the full list of options.
 socket_options = [{keepalive, true}, {nodelay, false}]
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index 6b46f0f..3a8abcf 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -27,7 +27,7 @@
 ; 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}]
+;socket_options = [{recbuf, undefined}, {sndbuf, 262144}, {nodelay, true}]
 
 [httpd]
 ; NOTE that this only configures the "backend" node-local port, not the