diff options
| author | Loïc Hoguin <[email protected]> | 2013-05-16 17:38:29 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-05-16 17:38:29 +0200 |
| commit | 2e787fed568eac202d04912422bb2bcf811f9ed1 (patch) | |
| tree | 95678e70f1924e8065bbb5fca8a2b6d7f08107d4 /src | |
| parent | 08fcb38a1885da25166ae9520decdba910b39fc2 (diff) | |
| download | cowboy-2e787fed568eac202d04912422bb2bcf811f9ed1.tar.gz cowboy-2e787fed568eac202d04912422bb2bcf811f9ed1.tar.bz2 cowboy-2e787fed568eac202d04912422bb2bcf811f9ed1.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cowboy_rest.erl | 6 |
1 files changed, 5 insertions, 1 deletions
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, []) -> |