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 /src | |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/cowboy_rest.erl | 2 |
1 files changed, 1 insertions, 1 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). |