summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2023-04-18 14:00:30 +0100
committerRobert Newson <rnewson@apache.org>2023-04-22 11:20:02 +0100
commitda826908ed30ef357792c53f611b3d11dd7216c1 (patch)
treeb050e45750643d1cecfc7a5e0b025d0069f157a5
parentf4a729edede0c8708002dd0a7745afa99f27b8d3 (diff)
downloadcouchdb-da826908ed30ef357792c53f611b3d11dd7216c1.tar.gz
cleanly pass a 417 from dropwizard
-rw-r--r--src/chttpd/src/chttpd.erl2
-rw-r--r--src/nouveau/src/nouveau_api.erl2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl
index c2d603049..b3080618d 100644
--- a/src/chttpd/src/chttpd.erl
+++ b/src/chttpd/src/chttpd.erl
@@ -1083,6 +1083,8 @@ error_info({bad_ctype, Reason}) ->
{415, <<"bad_content_type">>, Reason};
error_info(requested_range_not_satisfiable) ->
{416, <<"requested_range_not_satisfiable">>, <<"Requested range not satisfiable">>};
+error_info({expectation_failed, Reason}) ->
+ {417, <<"expectation_failed">>, Reason};
error_info({error, {illegal_database_name, Name}}) ->
Message =
<<"Name: '", Name/binary, "'. Only lowercase characters (a-z), ",
diff --git a/src/nouveau/src/nouveau_api.erl b/src/nouveau/src/nouveau_api.erl
index fb7fe5812..99139a94d 100644
--- a/src/nouveau/src/nouveau_api.erl
+++ b/src/nouveau/src/nouveau_api.erl
@@ -184,6 +184,8 @@ jaxrs_error("404", Body) ->
{not_found, message(Body)};
jaxrs_error("405", Body) ->
{method_not_allowed, message(Body)};
+jaxrs_error("417", Body) ->
+ {expectation_failed, message(Body)};
jaxrs_error("422", Body) ->
{bad_request, lists:join(" and ", errors(Body))};
jaxrs_error("500", Body) ->