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

Add 'Accept-Charset' to cowboy_http_req:parse_header/2

Browse source
This commit is contained in:
Loïc Hoguin 2011-10-26 20:54:21 +02:00
parent 819eb219e7
commit 4cd825923f
2 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/cowboy_http.erl
View file

@ -17,7 +17,8 @@
%% Parsing.
-export([list/2, nonempty_list/2,
media_range/2, token/2, token_ci/2, quoted_string/2]).
media_range/2, charset/2,
token/2, token_ci/2, quoted_string/2]).
%% Interpretation.
-export([connection_to_atom/1]).
@ -195,6 +196,42 @@ accept_ext_value(Data, Fun, Type, SubType, Params, Quality, Acc, Attr) ->
Type, SubType, Params, Quality, [{Attr, Value}|Acc])
end).
%% @doc Parse a charset, followed by an optional quality value.
-spec charset(binary(), fun()) -> any().
charset(Data, Fun) ->
token_ci(Data,
fun (_Rest, <<>>) -> {error, badarg};
(Rest, Charset) ->
whitespace(Rest,
fun (<< $;, Rest2/bits >>) ->
whitespace(Rest2,
fun (Rest3) ->
qparam(Rest3,
fun (Rest4, Quality) ->
Fun(Rest4, {Charset, Quality})
end)
end);
(Rest2) ->
Fun(Rest2, {Charset, 1000})
end)
end).
%% Parse a quality parameter string (for example q=0.500).
-spec qparam(binary(), fun()) -> any().
qparam(<< $q, Rest/bits >>, Fun) ->
whitespace(Rest,
fun (<< $=, Rest2/bits >>) ->
whitespace(Rest2,
fun (Rest3) ->
qvalue(Rest3,
fun (Rest4, Quality) ->
Fun(Rest4, Quality)
end)
end);
(_Rest2) ->
{error, badarg}
end).
%% @doc Skip whitespace.
-spec whitespace(binary(), fun()) -> any().
whitespace(<< C, Rest/bits >>, Fun)
@ -293,6 +330,17 @@ connection_to_atom([_Any|Tail]) ->
-ifdef(TEST).
nonempty_charset_list_test_() ->
%% {Value, Result}
Tests = [
{<<>>, {error, badarg}},
{<<"iso-8859-5, unicode-1-1;q=0.8">>, [
{<<"iso-8859-5">>, 1000},
{<<"unicode-1-1">>, 800}
]}
],
[{V, fun() -> R = nonempty_list(V, fun charset/2) end} || {V, R} <- Tests].
nonempty_token_list_test_() ->
%% {Value, Result}
Tests = [

6
src/cowboy_http_req.erl
View file

@ -201,6 +201,7 @@ parse_header(Name, Req=#http_req{p_headers=PHeaders}) ->
%% @doc Default values for semantic header parsing.
-spec parse_header_default(http_header()) -> any().
parse_header_default('Accept') -> [];
parse_header_default('Accept-Charset') -> [];
parse_header_default('Accept-Encoding') -> [];
parse_header_default('Connection') -> [];
parse_header_default(_Name) -> undefined.
@ -215,6 +216,11 @@ parse_header(Name, Req, Default) when Name =:= 'Accept' ->
fun (Value) ->
cowboy_http:list(Value, fun cowboy_http:media_range/2)
end);
parse_header(Name, Req, Default) when Name =:= 'Accept-Charset' ->
parse_header(Name, Req, Default,
fun (Value) ->
cowboy_http:nonempty_list(Value, fun cowboy_http:charset/2)
end);
parse_header(Name, Req, Default) when Name =:= 'Accept-Encoding' ->
parse_header(Name, Req, Default,
fun (Value) ->