Ignore empty entries when parsing MediaTypes and MimeTypes

Prior to Spring Framework 5.1.3, MimeTypeUtils.parseMimeTypes() and
MediaType.parseMediaTypes() ignored empty entries, but 5.1.3 introduced
a regression in that an empty entry -- for example, due to a trailing
comma in the list of media types in an HTTP Accept header -- would result
in a "406 Not Acceptable" response status.

This commit fixes this by filtering out empty entries before parsing
them into MimeType and MediaType instances. Empty entries are therefore
effectively ignored.

Fixes gh-23241
This commit is contained in:
Sam Brannen
2019-07-07 12:39:46 +02:00
parent 7a7d4109ac
commit efab6eb55d
4 changed files with 23 additions and 4 deletions

View File

@@ -143,6 +143,13 @@ public class MediaTypeTests {
assertEquals("Invalid amount of media types", 0, mediaTypes.size());
}
@Test // gh-23241
public void parseMediaTypesWithTrailingComma() {
List<MediaType> mediaTypes = MediaType.parseMediaTypes("text/plain, text/html, ");
assertNotNull("No media types returned", mediaTypes);
assertEquals("Incorrect number of media types", 2, mediaTypes.size());
}
@Test
public void compareTo() {
MediaType audioBasic = new MediaType("audio", "basic");