diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2018-11-07 13:51:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 13:51:03 -0500 |
| commit | 52523e01557d1003e5c66acb6474efe26f1e91bc (patch) | |
| tree | 3999e04f3b5388b6431cdd3ebd11eeca18a60f9b | |
| parent | cc2d4b9d3bf2606f1c7fe1ef309b94169cda97f2 (diff) | |
| parent | b0f65e8b3b036ea5acde07847fb28a8754527980 (diff) | |
| download | couchdb-1604-couchup-security.tar.gz | |
Merge branch 'master' into 1604-couchup-security1604-couchup-security
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | src/chttpd/src/chttpd_misc.erl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e345ea487..cd3a4437c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -279,7 +279,7 @@ without needing any other steps like setting git upstreams! :sparkles: ## Thanks -Special thanks to [Hoodie][https://github.com/hoodiehq/hoodie] for the great +Special thanks to [Hoodie](https://github.com/hoodiehq/hoodie) for the great CONTRIBUTING.md template. [1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/ diff --git a/src/chttpd/src/chttpd_misc.erl b/src/chttpd/src/chttpd_misc.erl index 7b417b442..39ffa2368 100644 --- a/src/chttpd/src/chttpd_misc.erl +++ b/src/chttpd/src/chttpd_misc.erl @@ -242,7 +242,9 @@ cancel_replication(PostBody, Ctx) -> {error, badrpc}; Else -> % Unclear what to do here -- pick the first error? - hd(Else) + % Except try ignoring any {error, not_found} responses + % because we'll always get two of those + hd(Else -- [{error, not_found}]) end end. |