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 2020/04/21 16:05:46 UTC
[couchdb] 01/01: Merge branch 'master' into fauxton_1.2.3
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch fauxton_1.2.3
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f6295be6d2b5f13a38a44593710edc22ac645264
Merge: 2a40315 f9dc835
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Apr 21 11:52:48 2020 -0400
Merge branch 'master' into fauxton_1.2.3
.credo.exs | 9 +-
.gitignore | 2 +
Makefile | 44 +-
Makefile.win | 190 ++++---
README.rst | 4 +-
bin/warnings_in_scope | 125 +++++
build-aux/Jenkinsfile.full | 39 +-
configure | 13 +
configure.ps1 | 29 ++
dev/run | 28 ++
emilio.config | 20 +
mix.exs | 4 +-
mix.lock | 28 +-
rebar.config.script | 5 +-
rel/files/couchdb.cmd.in | 2 +-
rel/overlay/etc/default.ini | 33 +-
rel/reltool.config | 2 +
src/chttpd/src/chttpd_auth.erl | 23 +-
src/chttpd/src/chttpd_auth_request.erl | 2 +-
src/chttpd/test/eunit/chttpd_auth_tests.erl | 129 +++++
src/couch/include/couch_eunit.hrl | 5 +
src/couch/priv/couch_js/60/http.cpp | 214 +++-----
src/couch/priv/couch_js/60/main.cpp | 70 ++-
src/couch/priv/couch_js/60/utf8.cpp | 301 ------------
src/couch/priv/couch_js/60/utf8.h | 19 -
src/couch/priv/couch_js/60/util.cpp | 196 +++++---
src/couch/priv/couch_js/60/util.h | 4 +-
src/couch/rebar.config.script | 23 +-
src/couch/src/couch_auth_cache.erl | 383 ++-------------
src/couch/src/couch_httpd_auth.erl | 32 +-
src/couch/src/couch_secondary_sup.erl | 3 +-
src/couch/src/couch_server.erl | 5 +-
src/couch/src/couch_util.erl | 7 +-
src/couch/test/eunit/couch_auth_cache_tests.erl | 28 +-
src/couch/test/eunit/couch_js_tests.erl | 156 +++++-
src/couch/test/eunit/couch_util_tests.erl | 7 +
.../test/eunit/couchdb_cookie_domain_tests.erl | 13 +-
src/couch_mrview/src/couch_mrview_index.erl | 6 +
.../src/couch_replicator_clustering.erl | 16 +-
src/dreyfus/src/dreyfus_httpd.erl | 2 +-
src/fabric/src/fabric_rpc.erl | 5 +-
src/fabric/test/eunit/fabric_rpc_tests.erl | 181 +++++++
src/jwtf/.gitignore | 4 +
src/jwtf/LICENSE | 176 +++++++
src/jwtf/README.md | 18 +
src/jwtf/rebar.config | 2 +
src/jwtf/src/jwtf.app.src | 32 ++
src/jwtf/src/jwtf.erl | 353 +++++++++++++
src/jwtf/src/jwtf_app.erl | 28 ++
src/jwtf/src/jwtf_keystore.erl | 161 ++++++
src/jwtf/src/jwtf_sup.erl | 38 ++
src/jwtf/test/jwtf_keystore_tests.erl | 57 +++
src/jwtf/test/jwtf_tests.erl | 317 ++++++++++++
src/mango/README.md | 328 ++++++++++---
src/mango/TODO.md | 19 +-
src/mango/rebar.config | 2 +
src/mango/requirements.txt | 2 +-
src/mango/test/05-index-selection-test.py | 8 +-
src/mango/test/12-use-correct-index-test.py | 2 +-
src/mango/test/README.md | 17 +-
src/mango/test/mango.py | 8 +
src/mango/test/user_docs.py | 4 +
src/mem3/src/mem3_reshard_dbdoc.erl | 3 +-
src/mem3/src/mem3_rpc.erl | 2 +-
src/mem3/src/mem3_shards.erl | 22 +-
src/mem3/src/mem3_sync_event_listener.erl | 14 +-
src/mem3/src/mem3_util.erl | 86 +++-
src/setup/src/setup_httpd.erl | 36 +-
test/elixir/README.md | 33 +-
test/elixir/lib/couch.ex | 4 +-
test/elixir/lib/couch/db_test.ex | 37 +-
test/elixir/test/changes_async_test.exs | 545 +++++++++++++++++++++
test/elixir/test/changes_test.exs | 440 ++++++++++++++++-
test/elixir/test/config/test-config.ini | 2 +
test/elixir/test/cookie_auth_test.exs | 15 +-
test/elixir/test/design_docs_query_test.exs | 273 +++++++++++
test/elixir/test/design_docs_test.exs | 507 ++++++++++++++++---
test/elixir/test/design_options_test.exs | 74 +++
test/elixir/test/design_paths_test.exs | 76 +++
test/elixir/test/form_submit_test.exs | 29 ++
test/elixir/test/http_test.exs | 81 +++
test/elixir/test/jsonp_test.exs | 116 +++++
test/elixir/test/jwtauth_test.exs | 140 ++++++
test/elixir/test/method_override_test.exs | 55 +++
test/elixir/test/proxyauth_test.exs | 163 ++++++
test/elixir/test/purge_test.exs | 168 +++++++
test/elixir/test/recreate_doc_test.exs | 165 +++++++
test/elixir/test/reduce_builtin_test.exs | 282 +++++++++++
test/elixir/test/reduce_false_test.exs | 50 ++
test/elixir/test/users_db_test.exs | 3 +-
test/elixir/test/utf8_test.exs | 2 +-
test/elixir/test/view_offsets_test.exs | 100 ++++
test/elixir/test/view_pagination_test.exs | 189 +++++++
test/javascript/tests/changes.js | 11 +-
test/javascript/tests/design_docs.js | 2 +
test/javascript/tests/design_docs_query.js | 4 +-
test/javascript/tests/design_options.js | 5 +-
test/javascript/tests/design_paths.js | 3 +-
test/javascript/tests/erlang_views.js | 2 +-
test/javascript/tests/form_submit.js | 3 +
test/javascript/tests/http.js | 3 +-
test/javascript/tests/jsonp.js | 2 +
test/javascript/tests/method_override.js | 2 +
test/javascript/tests/proxyauth.js | 51 +-
test/javascript/tests/purge.js | 2 +-
test/javascript/tests/reader_acl.js | 8 +-
test/javascript/tests/recreate_doc.js | 1 +
test/javascript/tests/security_validation.js | 7 +-
test/javascript/tests/view_errors.js | 8 +-
test/javascript/tests/view_offsets.js | 2 +
test/javascript/tests/view_pagination.js | 2 +
111 files changed, 6392 insertions(+), 1421 deletions(-)
diff --cc rebar.config.script
index 885cf4b,408ad3d..bfca5c8
--- a/rebar.config.script
+++ b/rebar.config.script
@@@ -150,9 -151,9 +151,9 @@@ DepDescs =
%% Non-Erlang deps
{docs, {url, "https://github.com/apache/couchdb-documentation"},
- {tag, "2.3.0"}, [raw]},
+ {tag, "3.0.0"}, [raw]},
{fauxton, {url, "https://github.com/apache/couchdb-fauxton"},
- {tag, "v1.2.2"}, [raw]},
+ {tag, "v1.2.3"}, [raw]},
%% Third party deps
{folsom, "folsom", {tag, "CouchDB-0.8.3"}},
{hyper, "hyper", {tag, "CouchDB-2.2.0-6"}},