diff options
| author | Loïc Hoguin <[email protected]> | 2012-12-11 00:05:42 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2012-12-11 00:05:42 +0100 |
| commit | 08a4975c3467e236473445954181804c339bac34 (patch) | |
| tree | f768607fe80d6d45e4569d735839545a9ad9fb6d /src/cowboy_rest.erl | |
| parent | 6d4e15705fc1ac4a8cbb12cb9ea5ce62cf4df8b0 (diff) | |
| download | cowboy-08a4975c3467e236473445954181804c339bac34.tar.gz cowboy-08a4975c3467e236473445954181804c339bac34.tar.bz2 cowboy-08a4975c3467e236473445954181804c339bac34.zip | |
Fix charset not working properly for REST
Diffstat (limited to 'src/cowboy_rest.erl')
| -rw-r--r-- | src/cowboy_rest.erl | 6 |
1 files changed, 3 insertions, 3 deletions
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). |