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

charsets_provided in rest module to return [binary()]

Browse source
This commit is contained in:
Cristian Hancila 2012-10-26 23:54:36 -04:00 • committed by Cristian
parent d3277b08ce
commit 4ddacaf6f6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cowboy_rest.erl
View file

@ -40,7 +40,7 @@
language_a :: undefined | binary(),
%% Charset.
charsets_p = [] :: [{binary(), atom()}],
charsets_p = [] :: [binary()],
charset_a :: undefined | binary(),
%% Cached resource calls.
@ -371,7 +371,7 @@ charsets_provided(Req, State) ->
case AcceptCharset of
undefined ->
set_content_type(Req3, State2#state{
charset_a=element(1, hd(CP))});
charset_a=hd(CP)});
AcceptCharset ->
AcceptCharset2 = prioritize_charsets(AcceptCharset),
choose_charset(Req3, State2, AcceptCharset2)
@ -401,7 +401,7 @@ choose_charset(Req, State=#state{charsets_p=CP}, [Charset|Tail]) ->
match_charset(Req, State, Accept, [], _Charset) ->
choose_charset(Req, State, Accept);
match_charset(Req, State, _Accept, [{Provided, _}|_], {Provided, _}) ->
match_charset(Req, State, _Accept, [Provided|_], {Provided, _}) ->
set_content_type(Req, State#state{charset_a=Provided});
match_charset(Req, State, Accept, [_|Tail], Charset) ->
match_charset(Req, State, Accept, Tail, Charset).