aspnet
diff --git a/‎test/Microsoft.AspNetCore.Http.Tests/Features/FormFeatureTests.cs‎
Lines changed: 51 additions & 0 deletions b/‎test/Microsoft.AspNetCore.Http.Tests/Features/FormFeatureTests.cs‎
Lines changed: 51 additions & 0 deletions
@@ -49,11 +49,15 @@ public async Task ReadFormAsync_SimpleData_ReturnsParsedFormCollection(bool buff
 
  private const string MultipartContentType = "multipart/form-data; boundary=WebKitFormBoundary5pDRpGheQXaM8k3T";
 
+ private const string MultipartContentTypeWithSpecialCharacters = "multipart/form-data; boundary=\"WebKitFormBoundary/:5pDRpGheQXaM8k3T\"";
+
  private const string EmptyMultipartForm = "--WebKitFormBoundary5pDRpGheQXaM8k3T--";
 
  // Note that CRLF (\r\n) is required. You can't use multi-line C# strings here because the line breaks on Linux are just LF.
  private const string MultipartFormEnd = "--WebKitFormBoundary5pDRpGheQXaM8k3T--\r\n";
 
+ private const string MultipartFormEndWithSpecialCharacters = "--WebKitFormBoundary/:5pDRpGheQXaM8k3T--\r\n";
+
  private const string MultipartFormField = "--WebKitFormBoundary5pDRpGheQXaM8k3T\r\n" +
 "Content-Disposition: form-data; name=\"description\"\r\n" +
 "\r\n" +
@@ -71,6 +75,12 @@ public async Task ReadFormAsync_SimpleData_ReturnsParsedFormCollection(bool buff
 "\r\n" +
 "<html><body>Hello World</body></html>\r\n";
 
+ private const string MultipartFormFileSpecialCharacters = "--WebKitFormBoundary/:5pDRpGheQXaM8k3T\r\n" +
+"Content-Disposition: form-data; name=\"description\"\r\n" +
+"\r\n" +
+"Foo\r\n";
+
+
  private const string MultipartFormWithField =
  MultipartFormField +
  MultipartFormEnd;
@@ -88,6 +98,10 @@ public async Task ReadFormAsync_SimpleData_ReturnsParsedFormCollection(bool buff
  MultipartFormEncodedFilename +
  MultipartFormEnd;
 
+ private const string MultipartFormWithSpecialCharacters =
+ MultipartFormFileSpecialCharacters +
+ MultipartFormEndWithSpecialCharacters;
+
  [Theory]
  [InlineData(true)]
  [InlineData(false)]
@@ -208,6 +222,43 @@ public async Task ReadFormAsync_MultipartWithFile_ReturnsParsedFormCollection(bo
  await responseFeature.CompleteAsync();
  }
 
+ [Theory]
+ [InlineData(true)]
+ [InlineData(false)]
+ public async Task ReadFormAsync_MultipartWithFileAndQuotedBoundaryString_ReturnsParsedFormCollection(bool bufferRequest)
+ {
+ var formContent = Encoding.UTF8.GetBytes(MultipartFormWithSpecialCharacters);
+ var context = new DefaultHttpContext();
+ var responseFeature = new FakeResponseFeature();
+ context.Features.Set<IHttpResponseFeature>(responseFeature);
+ context.Request.ContentType = MultipartContentTypeWithSpecialCharacters;
+ context.Request.Body = new NonSeekableReadStream(formContent);
+
+ IFormFeature formFeature = new FormFeature(context.Request, new FormOptions() { BufferBody = bufferRequest });
+ context.Features.Set<IFormFeature>(formFeature);
+
+ var formCollection = context.Request.Form;
+
+ Assert.NotNull(formCollection);
+
+ // Cached
+ formFeature = context.Features.Get<IFormFeature>();
+ Assert.NotNull(formFeature);
+ Assert.NotNull(formFeature.Form);
+ Assert.Same(formCollection, formFeature.Form);
+ Assert.Same(formCollection, await context.Request.ReadFormAsync());
+
+ // Content
+ Assert.Equal(1, formCollection.Count);
+ Assert.Equal("Foo", formCollection["description"]);
+
+ Assert.NotNull(formCollection.Files);
+ Assert.Equal(0, formCollection.Files.Count);
+
+ // Cleanup
+ await responseFeature.CompleteAsync();
+ }
+
  [Theory]
  [InlineData(true)]
  [InlineData(false)]