Merge branch '5.1.x'

2019-06-03 16:34:58 -04:00
parent cb97a1b371 d2ec876f57
commit e89fd5c3be
3 changed files with 20 additions and 4 deletions
--- a/spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
+++ b/spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
@@ -81,6 +81,14 @@ public class ContentDispositionTests {
 				.filename("中文.txt", StandardCharsets.UTF_8).build());
 	}

+	@Test // gh-23077
+	public void parseWithEscapedQuote() {
+		ContentDisposition disposition = ContentDisposition.parse(
+				"form-data; name=\"file\"; filename=\"\\\"The Twilight Zone\\\".txt\"; size=123");
+		assertThat(ContentDisposition.builder("form-data").name("file")
+				.filename("\\\"The Twilight Zone\\\".txt").size(123L).build()).isEqualTo(disposition);
+	}
+
 	@Test
 	public void parseEmpty() {
 		assertThatIllegalArgumentException().isThrownBy(() ->