diff options
| author | Loïc Hoguin <[email protected]> | 2013-01-29 22:27:50 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-01-29 22:33:03 +0100 |
| commit | d9b3727a628975dfcc8707e143e45884873e42cb (patch) | |
| tree | 780dff043589c4c03e4075423749a28189de4738 | |
| parent | f710ac86f87cd9a6a6daa36a9d3c28f397f32397 (diff) | |
| parent | f1b4acbb441f665f7387ad30dda5bb861ec0400a (diff) | |
| download | cowboy-d9b3727a628975dfcc8707e143e45884873e42cb.tar.gz cowboy-d9b3727a628975dfcc8707e143e45884873e42cb.tar.bz2 cowboy-d9b3727a628975dfcc8707e143e45884873e42cb.zip | |
Merge branch 'patch-1' of https://github.com/CamShaft/cowboy
Conflicts:
src/cowboy_rest.erl
| -rw-r--r-- | src/cowboy_rest.erl | 2 | ||||
| -rw-r--r-- | test/http_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl index 8967b1d..a49d622 100644 --- a/src/cowboy_rest.erl +++ b/src/cowboy_rest.erl @@ -793,7 +793,7 @@ choose_content_type(Req, next(Req2, State2, OnTrue); {false, Req2, HandlerState2} -> State2 = State#state{handler_state=HandlerState2}, - respond(Req2, State2, 500) + respond(Req2, State2, 422) end; choose_content_type(Req, State, OnTrue, ContentType, [_Any|Tail]) -> choose_content_type(Req, State, OnTrue, ContentType, Tail). diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index 0b35cf3..afe62c3 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -855,7 +855,7 @@ rest_nodelete(Config) -> rest_patch(Config) -> Tests = [ {204, [{<<"content-type">>, <<"text/plain">>}], <<"whatever">>}, - {500, [{<<"content-type">>, <<"text/plain">>}], <<"false">>}, + {422, [{<<"content-type">>, <<"text/plain">>}], <<"false">>}, {400, [{<<"content-type">>, <<"text/plain">>}], <<"halt">>}, {415, [{<<"content-type">>, <<"application/json">>}], <<"bad_content_type">>} ], |