mirror of
https://github.com/ninenines/cowboy.git
synced 2025-07-15 04:30:25 +00:00
Merge branch 'master' of git://github.com/chancila/cowboy
This commit is contained in:
commit
8cd9183272
1 changed files with 3 additions and 3 deletions
|
@ -40,7 +40,7 @@
|
||||||
language_a :: undefined | binary(),
|
language_a :: undefined | binary(),
|
||||||
|
|
||||||
%% Charset.
|
%% Charset.
|
||||||
charsets_p = [] :: [{binary(), atom()}],
|
charsets_p = [] :: [binary()],
|
||||||
charset_a :: undefined | binary(),
|
charset_a :: undefined | binary(),
|
||||||
|
|
||||||
%% Cached resource calls.
|
%% Cached resource calls.
|
||||||
|
@ -372,7 +372,7 @@ charsets_provided(Req, State) ->
|
||||||
case AcceptCharset of
|
case AcceptCharset of
|
||||||
undefined ->
|
undefined ->
|
||||||
set_content_type(Req3, State2#state{
|
set_content_type(Req3, State2#state{
|
||||||
charset_a=element(1, hd(CP))});
|
charset_a=hd(CP)});
|
||||||
AcceptCharset ->
|
AcceptCharset ->
|
||||||
AcceptCharset2 = prioritize_charsets(AcceptCharset),
|
AcceptCharset2 = prioritize_charsets(AcceptCharset),
|
||||||
choose_charset(Req3, State2, AcceptCharset2)
|
choose_charset(Req3, State2, AcceptCharset2)
|
||||||
|
@ -402,7 +402,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).
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue