Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart

This commit is contained in:
Lachlan Roberts 2018-03-27 11:55:57 +11:00
parent 00bc18edb9 ba56bc7994
commit 115c280b88
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java
View File

@ -47,6 +47,7 @@ import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.MultiException;
import org.eclipse.jetty.util.MultiMap; import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
@ -632,6 +633,10 @@ public class MultiPartFormInputStream
contentDisposition = value; contentDisposition = value;
else if (key.equalsIgnoreCase("content-type")) else if (key.equalsIgnoreCase("content-type"))
contentType = value; contentType = value;
// Transfer encoding is not longer considers as it is deprecated as per
// https://tools.ietf.org/html/rfc7578#section-4.7
} }
@Override @Override

4
jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java
View File

@ -71,8 +71,8 @@ public class MultiPartCaptureTest
// Capture of raw request body contents from Apache HttpComponents 4.5.5 // Capture of raw request body contents from Apache HttpComponents 4.5.5
ret.add(new String[]{"multipart-text-files"}); ret.add(new String[]{"multipart-text-files"});
ret.add(new String[]{"multipart-base64"}); // ret.add(new String[]{"multipart-base64"}); // base64 transfer encoding deprecated
ret.add(new String[]{"multipart-base64-long"}); // ret.add(new String[]{"multipart-base64-long"}); // base64 transfer encoding deprecated
ret.add(new String[]{"multipart-complex"}); ret.add(new String[]{"multipart-complex"});
ret.add(new String[]{"multipart-duplicate-names-1"}); ret.add(new String[]{"multipart-duplicate-names-1"});
ret.add(new String[]{"multipart-encoding-mess"}); ret.add(new String[]{"multipart-encoding-mess"});