Browse Source

The charset iso-8859-1 is added only if not explicitely mentioned

It was added all the time when * was missing, the RFC specifies it
should only be added if it wasn't already present, though.
Loïc Hoguin 12 years ago
parent
commit
2e787fed56
1 changed files with 5 additions and 1 deletions
  1. 5 1
      src/cowboy_rest.erl

+ 5 - 1
src/cowboy_rest.erl

@@ -426,7 +426,11 @@ prioritize_charsets(AcceptCharsets) ->
 		end, AcceptCharsets),
 		end, AcceptCharsets),
 	case lists:keymember(<<"*">>, 1, AcceptCharsets2) of
 	case lists:keymember(<<"*">>, 1, AcceptCharsets2) of
 		true -> AcceptCharsets2;
 		true -> AcceptCharsets2;
-		false -> [{<<"iso-8859-1">>, 1000}|AcceptCharsets2]
+		false ->
+			case lists:keymember(<<"iso-8859-1">>, 1, AcceptCharsets2) of
+				true -> AcceptCharsets2;
+				false -> [{<<"iso-8859-1">>, 1000}|AcceptCharsets2]
+			end
 	end.
 	end.
 
 
 choose_charset(Req, State, []) ->
 choose_charset(Req, State, []) ->