[couchdb] branch 1409-recbuf-sndbuf-undefined updated (55e617b -> d9f6587)

[wo...@apache.org]

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

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


    omit 55e617b  Use new mochiweb recbuf|sndbuf undefined setting
     new d9f6587  Use new mochiweb recbuf|sndbuf undefined setting

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (55e617b)
            \
             N -- N -- N   refs/heads/1409-recbuf-sndbuf-undefined (d9f6587)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 rel/overlay/etc/default.ini | 8 ++++----
 rel/overlay/etc/local.ini   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

[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