diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cowboy.app.src | 3 | ||||
-rw-r--r-- | src/cowboy_req.erl | 21 | ||||
-rw-r--r-- | src/cowboy_rest.erl | 2 | ||||
-rw-r--r-- | src/cowboy_websocket.erl | 4 |
4 files changed, 7 insertions, 23 deletions
diff --git a/src/cowboy.app.src b/src/cowboy.app.src index e70a65f..b68ef14 100644 --- a/src/cowboy.app.src +++ b/src/cowboy.app.src @@ -20,7 +20,8 @@ {applications, [ kernel, stdlib, - ranch + ranch, + crypto ]}, {mod, {cowboy_app, []}}, {env, []} diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl index 5b8cb7e..67d2a0f 100644 --- a/src/cowboy_req.erl +++ b/src/cowboy_req.erl @@ -399,7 +399,6 @@ parse_header(Name, Req=#http_req{p_headers=PHeaders}) -> %% @doc Default values for semantic header parsing. -spec parse_header_default(binary()) -> any(). -parse_header_default(<<"connection">>) -> []; parse_header_default(<<"transfer-encoding">>) -> [<<"identity">>]; parse_header_default(_Name) -> undefined. @@ -430,15 +429,9 @@ parse_header(Name, Req, Default) when Name =:= <<"accept-language">> -> cowboy_http:nonempty_list(Value, fun cowboy_http:language_range/2) end); parse_header(Name, Req, Default) when Name =:= <<"content-length">> -> - parse_header(Name, Req, Default, - fun (Value) -> - cowboy_http:digits(Value) - end); + parse_header(Name, Req, Default, fun cowboy_http:digits/1); parse_header(Name, Req, Default) when Name =:= <<"content-type">> -> - parse_header(Name, Req, Default, - fun (Value) -> - cowboy_http:content_type(Value) - end); + parse_header(Name, Req, Default, fun cowboy_http:content_type/1); parse_header(Name, Req, Default) when Name =:= <<"expect">> -> parse_header(Name, Req, Default, fun (Value) -> @@ -446,17 +439,11 @@ parse_header(Name, Req, Default) when Name =:= <<"expect">> -> end); parse_header(Name, Req, Default) when Name =:= <<"if-match">>; Name =:= <<"if-none-match">> -> - parse_header(Name, Req, Default, - fun (Value) -> - cowboy_http:entity_tag_match(Value) - end); + parse_header(Name, Req, Default, fun cowboy_http:entity_tag_match/1); parse_header(Name, Req, Default) when Name =:= <<"if-modified-since">>; Name =:= <<"if-unmodified-since">> -> - parse_header(Name, Req, Default, - fun (Value) -> - cowboy_http:http_date(Value) - end); + parse_header(Name, Req, Default, fun cowboy_http:http_date/1); %% @todo Extension parameters. parse_header(Name, Req, Default) when Name =:= <<"transfer-encoding">> -> parse_header(Name, Req, Default, diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl index 2f9faa8..c0decbd 100644 --- a/src/cowboy_rest.erl +++ b/src/cowboy_rest.erl @@ -470,7 +470,7 @@ variances(Req, State=#state{content_types_p=CTP, resource_exists(Req3, State2); [[<<", ">>, H]|Variances5] -> Req4 = cowboy_req:set_resp_header( - <<"Variances">>, [H|Variances5], Req3), + <<"Vary">>, [H|Variances5], Req3), resource_exists(Req4, State2) end. diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl index dcd3008..bc88011 100644 --- a/src/cowboy_websocket.erl +++ b/src/cowboy_websocket.erl @@ -13,10 +13,6 @@ %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. %% @doc WebSocket protocol implementation. -%% -%% When using websockets, make sure that the crypto application is -%% included in your release. If you are not using releases then there -%% is no need for concern as crypto is already included. -module(cowboy_websocket). %% API. |