From 08a4975c3467e236473445954181804c339bac34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Tue, 11 Dec 2012 00:05:42 +0100 Subject: Fix charset not working properly for REST --- src/cowboy_rest.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cowboy_rest.erl') diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl index f7bcfb8..35ca34d 100644 --- a/src/cowboy_rest.erl +++ b/src/cowboy_rest.erl @@ -40,7 +40,7 @@ language_a :: undefined | binary(), %% Charset. - charsets_p = [] :: [binary()], + charsets_p = [] :: [{binary(), integer()}], charset_a :: undefined | binary(), %% Cached resource calls. @@ -373,7 +373,7 @@ charsets_provided(Req, State) -> case AcceptCharset of undefined -> set_content_type(Req3, State2#state{ - charset_a=hd(CP)}); + charset_a=element(1, hd(CP))}); AcceptCharset -> AcceptCharset2 = prioritize_charsets(AcceptCharset), choose_charset(Req3, State2, AcceptCharset2) @@ -403,7 +403,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). -- cgit v1.2.3