Browse Source

Cleanup cowboy_req:parse_header/3

As suggested by @yrashk.
Loïc Hoguin 12 years ago
parent
commit
9facad9245
1 changed files with 4 additions and 17 deletions
  1. 4 17
      src/cowboy_req.erl

+ 4 - 17
src/cowboy_req.erl

@@ -399,7 +399,6 @@ parse_header(Name, Req=#http_req{p_headers=PHeaders}) ->
 
 
 %% @doc Default values for semantic header parsing.
 %% @doc Default values for semantic header parsing.
 -spec parse_header_default(binary()) -> any().
 -spec parse_header_default(binary()) -> any().
-parse_header_default(<<"connection">>) -> [];
 parse_header_default(<<"transfer-encoding">>) -> [<<"identity">>];
 parse_header_default(<<"transfer-encoding">>) -> [<<"identity">>];
 parse_header_default(_Name) -> undefined.
 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)
 			cowboy_http:nonempty_list(Value, fun cowboy_http:language_range/2)
 		end);
 		end);
 parse_header(Name, Req, Default) when Name =:= <<"content-length">> ->
 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) 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) when Name =:= <<"expect">> ->
 	parse_header(Name, Req, Default,
 	parse_header(Name, Req, Default,
 		fun (Value) ->
 		fun (Value) ->
@@ -446,17 +439,11 @@ parse_header(Name, Req, Default) when Name =:= <<"expect">> ->
 		end);
 		end);
 parse_header(Name, Req, Default)
 parse_header(Name, Req, Default)
 		when Name =:= <<"if-match">>; Name =:= <<"if-none-match">> ->
 		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)
 parse_header(Name, Req, Default)
 		when Name =:= <<"if-modified-since">>;
 		when Name =:= <<"if-modified-since">>;
 			Name =:= <<"if-unmodified-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.
 %% @todo Extension parameters.
 parse_header(Name, Req, Default) when Name =:= <<"transfer-encoding">> ->
 parse_header(Name, Req, Default) when Name =:= <<"transfer-encoding">> ->
 	parse_header(Name, Req, Default,
 	parse_header(Name, Req, Default,