From ba56bc7994d1ec0ce20d3757999e69187fe1c11b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 27 Mar 2018 11:55:20 +1100 Subject: [PATCH] Deprecated transfer encoding for parts Signed-off-by: Greg Wilkins --- .../org/eclipse/jetty/http/MultiPartFormInputStream.java | 7 ++++++- .../java/org/eclipse/jetty/http/MultiPartCaptureTest.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java b/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java index 504781e0dd8..ecde9c8e12e 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormInputStream.java @@ -47,6 +47,7 @@ import org.eclipse.jetty.util.LazyList; import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.MultiMap; 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.Logger; @@ -625,13 +626,17 @@ public class MultiPartFormInputStream @Override public void parsedField(String key, String value) - { + { // Add to headers and mark if one of these fields. // headers.put(key.toLowerCase(Locale.ENGLISH),value); if (key.equalsIgnoreCase("content-disposition")) contentDisposition = value; else if (key.equalsIgnoreCase("content-type")) contentType = value; + + // Transfer encoding is not longer considers as it is deprecated as per + // https://tools.ietf.org/html/rfc7578#section-4.7 + } @Override diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java index b261ab88ea1..444b5c8b53f 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java +++ b/jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java @@ -71,8 +71,8 @@ public class MultiPartCaptureTest // Capture of raw request body contents from Apache HttpComponents 4.5.5 ret.add(new String[]{"multipart-text-files"}); - ret.add(new String[]{"multipart-base64"}); - ret.add(new String[]{"multipart-base64-long"}); + // ret.add(new String[]{"multipart-base64"}); // base64 transfer encoding deprecated + // ret.add(new String[]{"multipart-base64-long"}); // base64 transfer encoding deprecated ret.add(new String[]{"multipart-complex"}); ret.add(new String[]{"multipart-duplicate-names-1"}); ret.add(new String[]{"multipart-encoding-mess"});