diff options
| author | Joan Touzet <joant@atypical.net> | 2018-06-25 12:29:48 -0400 |
|---|---|---|
| committer | Joan Touzet <wohali@users.noreply.github.com> | 2018-08-06 12:28:21 -0400 |
| commit | 99e801eca88a4521157d4369847f61cf2a88d1ba (patch) | |
| tree | 565743dbe4424b3af43639bc8e2475292126a6f9 | |
| parent | 0cbaefcaceff750c46ea612322fa1aa02d37c87e (diff) | |
| download | couchdb-99e801eca88a4521157d4369847f61cf2a88d1ba.tar.gz | |
Use new mochiweb recbuf|sndbuf undefined setting
Fixes #1409
| -rw-r--r-- | rel/overlay/etc/default.ini | 7 | ||||
| -rw-r--r-- | rel/overlay/etc/local.ini | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 084a16ec2..45025e780 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -83,7 +83,8 @@ port = {{cluster_port}} bind_address = 127.0.0.1 backlog = 512 docroot = {{fauxton_root}} -socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}] +socket_options = [{sndbuf, 262144}, {nodelay, true}] +server_options = [{recbuf, undefined}] 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. @@ -138,8 +139,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 = [{sndbuf, 262144}] enable_cors = false enable_xframe_options = false ; CouchDB can optionally enforce a maximum uri length; diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini index e3b7b1502..ea5467c9a 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 = [{sndbuf, 262144}, {nodelay, true}] [httpd] ; NOTE that this only configures the "backend" node-local port, not the |