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

charsets_provided/2 returns a list of charsets

Browse source 
It incorrectly returned a tuple containing the charset and an
associated quality which wasn't being used.
This commit is contained in:
Loïc Hoguin 2013-05-16 17:32:07 +02:00
parent 1d413ea51b
commit 08fcb38a18
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cowboy_rest.erl
View file

@ -45,7 +45,7 @@
language_a :: undefined | binary(), language_a :: undefined | binary(),
%% Charset. %% Charset.
charsets_p = [] :: [{binary(), integer()}], charsets_p = [] :: [binary()],
charset_a :: undefined | binary(), charset_a :: undefined | binary(),
%% Whether the resource exists. %% Whether the resource exists.
@ -406,8 +406,7 @@ charsets_provided(Req, State) ->
cowboy_req:parse_header(<<"accept-charset">>, Req2), cowboy_req:parse_header(<<"accept-charset">>, Req2),
case AcceptCharset of case AcceptCharset of
undefined -> undefined ->
set_content_type(Req3, State2#state{ set_content_type(Req3, State2#state{charset_a=hd(CP)});
charset_a=element(1, hd(CP))});
AcceptCharset -> AcceptCharset ->
AcceptCharset2 = prioritize_charsets(AcceptCharset), AcceptCharset2 = prioritize_charsets(AcceptCharset),
choose_charset(Req3, State2, AcceptCharset2) choose_charset(Req3, State2, AcceptCharset2)
@ -437,7 +436,7 @@ choose_charset(Req, State=#state{charsets_p=CP}, [Charset|Tail]) ->
match_charset(Req, State, Accept, [], _Charset) -> match_charset(Req, State, Accept, [], _Charset) ->
choose_charset(Req, State, Accept); 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}); set_content_type(Req, State#state{charset_a=Provided});
match_charset(Req, State, Accept, [_|Tail], Charset) -> match_charset(Req, State, Accept, [_|Tail], Charset) ->
match_charset(Req, State, Accept, Tail, Charset). match_charset(Req, State, Accept, Tail, Charset).