diff options
| author | Anthony Ramine <[email protected]> | 2011-11-04 11:42:36 +0100 |
|---|---|---|
| committer | Anthony Ramine <[email protected]> | 2011-11-04 12:21:01 +0100 |
| commit | 04bcbc444d507f6936bfee18347ec292efe0ae67 (patch) | |
| tree | a8016247d2f71cf55cdcbbf2aeede60def5b468e /src/cowboy_http.erl | |
| parent | 68c1d886e5c4cb974b62b9c5fe7f21e6bbc5d557 (diff) | |
| download | cowboy-04bcbc444d507f6936bfee18347ec292efe0ae67.tar.gz cowboy-04bcbc444d507f6936bfee18347ec292efe0ae67.tar.bz2 cowboy-04bcbc444d507f6936bfee18347ec292efe0ae67.zip | |
Support 'Content-Length' in parse_header/2
Diffstat (limited to 'src/cowboy_http.erl')
| -rw-r--r-- | src/cowboy_http.erl | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index 9b8a178..e8017f2 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -17,7 +17,7 @@ %% Parsing. -export([list/2, nonempty_list/2, - media_range/2, charset/2, + media_range/2, charset/2, digits/1, token/2, token_ci/2, quoted_string/2]). %% Interpretation. @@ -28,6 +28,11 @@ %% Parsing. +%% Use only as a guard. +-define(IS_DIGIT(C), + C =:= $0; C =:= $1; C =:= $2; C =:= $3; C =:= $4; + C =:= $5; C =:= $6; C =:= $7; C =:= $8; C =:= $9). + %% @doc Parse a non-empty list of the given type. -spec nonempty_list(binary(), fun()) -> [any(), ...] | {error, badarg}. nonempty_list(Data, Fun) -> @@ -240,6 +245,31 @@ whitespace(<< C, Rest/bits >>, Fun) whitespace(Data, Fun) -> Fun(Data). +%% @doc Parse a list of digits as a non negative integer. +-spec digits(binary()) -> non_neg_integer() | {error, badarg}. +digits(Data) -> + digits(Data, + fun (Rest, I) -> + whitespace(Rest, + fun (<<>>) -> + I; + (_Rest2) -> + {error, badarg} + end) + end). + +-spec digits(binary(), fun()) -> any(). +digits(<< C, Rest/bits >>, Fun) when ?IS_DIGIT(C) -> + digits(Rest, Fun, C - $0); +digits(_Data, _Fun) -> + {error, badarg}. + +-spec digits(binary(), fun(), non_neg_integer()) -> any(). +digits(<< C, Rest/bits >>, Fun, Acc) when ?IS_DIGIT(C) -> + digits(Rest, Fun, Acc * 10 + (C - $0)); +digits(Data, Fun, Acc) -> + Fun(Data, Acc). + %% @doc Parse a case-insensitive token. %% %% Changes all characters to lowercase. @@ -303,9 +333,7 @@ qvalue(_Data, _Fun) -> -spec qvalue(binary(), fun(), integer(), 1 | 10 | 100) -> any(). qvalue(Data, Fun, Q, 0) -> Fun(Data, Q); -qvalue(<< C, Rest/bits >>, Fun, Q, M) - when C =:= $0; C =:= $1; C =:= $2; C =:= $3; C =:= $4; - C =:= $5; C =:= $6; C =:= $7; C =:= $8; C =:= $9 -> +qvalue(<< C, Rest/bits >>, Fun, Q, M) when ?IS_DIGIT(C) -> qvalue(Rest, Fun, Q + (C - $0) * M, M div 10); qvalue(Data, Fun, Q, _M) -> Fun(Data, Q). @@ -405,4 +433,13 @@ connection_to_atom_test_() -> [{lists:flatten(io_lib:format("~p", [T])), fun() -> R = connection_to_atom(T) end} || {T, R} <- Tests]. +digits_test_() -> + %% {Digits, Result} + Tests = [ + {<<"42 ">>, 42}, + {<<"69\t">>, 69}, + {<<"1337">>, 1337} + ], + [{V, fun() -> R = digits(V) end} || {V, R} <- Tests]. + -endif. |