umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-15 20:50:24 +00:00
Code Issues Wiki Activity

REST: Normalize content types accepted

Browse source 
Same as content types provided, we accept the <<"application/json">> form.
This commit is contained in:
Loïc Hoguin 2012-07-21 19:02:01 +02:00
parent 95ed1348c3
commit 3d1ddd1d8a
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cowboy_http_rest.erl
View file

@ -203,7 +203,7 @@ content_types_provided(Req=#http_req{meta=Meta}, State) ->
{[], Req2, HandlerState} ->
not_acceptable(Req2, State#state{handler_state=HandlerState});
{CTP, Req2, HandlerState} ->
CTP2 = [normalize_content_types_provided(P) || P <- CTP],
CTP2 = [normalize_content_types(P) || P <- CTP],
State2 = State#state{
handler_state=HandlerState, content_types_p=CTP2},
{Accept, Req3} = cowboy_http_req:parse_header('Accept', Req2),
@ -219,10 +219,10 @@ content_types_provided(Req=#http_req{meta=Meta}, State) ->
end
end.
normalize_content_types_provided({ContentType, Handler})
normalize_content_types({ContentType, Callback})
when is_binary(ContentType) ->
{cowboy_http:content_type(ContentType), Handler};
normalize_content_types_provided(Provided) ->
{cowboy_http:content_type(ContentType), Callback};
normalize_content_types(Provided) ->
Provided.
prioritize_accept(Accept) ->
@ -724,10 +724,11 @@ put_resource(Req, State, OnTrue) ->
{halt, Req2, HandlerState} ->
terminate(Req2, State#state{handler_state=HandlerState});
{CTA, Req2, HandlerState} ->
CTA2 = [normalize_content_types(P) || P <- CTA],
State2 = State#state{handler_state=HandlerState},
{ContentType, Req3}
= cowboy_http_req:parse_header('Content-Type', Req2),
choose_content_type(Req3, State2, OnTrue, ContentType, CTA)
choose_content_type(Req3, State2, OnTrue, ContentType, CTA2)
end.
%% The special content type '*' will always match. It can be used as a