android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-12 10:23:16 +03:00
Code Releases Activity

Allow duplicated charsets in MediaType

Browse Source
This commit is contained in:
Tomasz Rozbicki
2014-07-27 23:27:00 +02:00
committed by Jesse Wilson
parent 5bc7de1f49
commit fb93a578ee
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
okhttp-tests/src/test/java/com/squareup/okhttp/MediaTypeTest.java
View File

@@ -107,6 +107,11 @@ public class MediaTypeTest {
assertEquals("UTF-8", mediaType.charset().name());
}
@Test public void testDuplicatedCharsets() {
MediaType mediaType = MediaType.parse("text/plain; charset=utf-8; charset=UTF-8");
assertEquals("UTF-8", mediaType.charset().name());
}
@Test public void testMultipleCharsets() {
try {
MediaType.parse("text/plain; charset=utf-8; charset=utf-16");

7
okhttp/src/main/java/com/squareup/okhttp/MediaType.java
View File

@@ -61,10 +61,13 @@ public final class MediaType {
String name = parameter.group(1);
if (name == null || !name.equalsIgnoreCase("charset")) continue;
if (charset != null) throw new IllegalArgumentException("Multiple charsets: " + string);
charset = parameter.group(2) != null
String charsetParameter = parameter.group(2) != null
? parameter.group(2) // Value is a token.
: parameter.group(3); // Value is a quoted string.
if (charset != null && !charsetParameter.equalsIgnoreCase(charset)) {
throw new IllegalArgumentException("Multiple different charsets: " + string);
}
charset = charsetParameter;
}
return new MediaType(string, type, subtype, charset);