diff options
author | Joan Touzet <joant@atypical.net> | 2018-06-25 12:29:48 -0400 |
---|---|---|
committer | Joan Touzet <joant@atypical.net> | 2018-06-25 15:33:31 -0400 |
commit | 82fd6513fabfbdad80de6e9b43c709db52b6c5fb (patch) | |
tree | 14364276ecc4642eb692423246b9b233967f0382 | |
parent | 103a0624f309ea0d796176a55eb5faea68f26047 (diff) | |
download | couchdb-82fd6513fabfbdad80de6e9b43c709db52b6c5fb.tar.gz |
Use new mochiweb recbuf|sndbuf undefined setting1409-recbuf-sndbuf-undefined
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 8b47cb04a..d536516f7 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. @@ -130,8 +131,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 6b46f0fa1..4ac2a8298 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 |