From 2e787fed568eac202d04912422bb2bcf811f9ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 16 May 2013 17:38:29 +0200 Subject: 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. --- src/cowboy_rest.erl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl index da3b1b5..b87c7df 100644 --- a/src/cowboy_rest.erl +++ b/src/cowboy_rest.erl @@ -426,7 +426,11 @@ prioritize_charsets(AcceptCharsets) -> end, AcceptCharsets), case lists:keymember(<<"*">>, 1, AcceptCharsets2) of 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. choose_charset(Req, State, []) -> -- cgit v1.2.3