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

jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartCaptureTest.java

@@ -28,7 +28,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.DigestOutputStream;
@@ -46,7 +45,6 @@ import javax.servlet.http.Part;
 import org.eclipse.jetty.toolchain.test.Hex;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.toolchain.test.TestingDir;
-import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.QuotedStringTokenizer;
 import org.eclipse.jetty.util.StringUtil;
@@ -60,8 +58,8 @@ import org.junit.runners.Parameterized;
 public class MultiPartCaptureTest
 {
 
-    public static final int MAX_FILE_SIZE = 60 * 1024;
-    public static final int MAX_REQUEST_SIZE = 1024 * 1024;
+    public static final int MAX_FILE_SIZE = 2 * 1024 * 1024;
+    public static final int MAX_REQUEST_SIZE = MAX_FILE_SIZE + (60 * 1024);
     public static final int FILE_SIZE_THRESHOLD = 50;
 
     @Parameterized.Parameters(name = "{0}")
@@ -69,25 +67,41 @@ public class MultiPartCaptureTest
     {
         List<Object[]> ret = new ArrayList<>();
 
-        // Capture of raw request body contents from Apache HttpComponents 4.5.5
-        ret.add(new String[]{"multipart-text-files"});
+        // == Arbitrary / Non-Standard Examples ==
+
+        ret.add(new String[]{"multipart-uppercase"});
         // 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"}); // TODO joakime bad capture includes ? in sjis content
-        ret.add(new String[]{"multipart-duplicate-names-1"});
-        ret.add(new String[]{"multipart-encoding-mess"});
-        // ret.add(new String[]{"multipart-inside-itself"}); // impossible test, badly chosen boundary
-        // ret.add(new String[]{"multipart-inside-itself-binary"}); // impossible test, badly chosen boundary
-        ret.add(new String[]{"multipart-number-browser"});
-        ret.add(new String[]{"multipart-number-strict"});
-        // ret.add(new String[]{"multipart-sjis"}); // TODO joakime bad capture includes ? in sjis content
-        ret.add(new String[]{"multipart-strange-quoting"});
-        ret.add(new String[]{"multipart-unicode-names"});
-        ret.add(new String[]{"multipart-uppercase"});
-        // ret.add(new String[]{"multipart-x-www-form-urlencoded"}); // not our job to decode content
-        ret.add(new String[]{"multipart-zencoding"});
 
-        // Capture of raw request body contents from various browsers
+        // == Capture of raw request body contents from Apache HttpClient 4.5.5 ==
+
+        ret.add(new String[]{"browser-capture-company-urlencoded-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-complex-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-duplicate-names-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-encoding-mess-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-nested-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-nested-binary-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-number-only2-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-number-only-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-sjis-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-strange-quoting-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-text-files-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-unicode-names-apache-httpcomp"});
+        ret.add(new String[]{"browser-capture-zalgo-text-plain-apache-httpcomp"});
+
+        // == Capture of raw request body contents from Eclipse Jetty Http Client 9.4.9 ==
+
+        ret.add(new String[]{"browser-capture-complex-jetty-client"});
+        ret.add(new String[]{"browser-capture-duplicate-names-jetty-client"});
+        ret.add(new String[]{"browser-capture-encoding-mess-jetty-client"});
+        ret.add(new String[]{"browser-capture-nested-jetty-client"});
+        ret.add(new String[]{"browser-capture-number-only-jetty-client"});
+        ret.add(new String[]{"browser-capture-sjis-jetty-client"});
+        ret.add(new String[]{"browser-capture-text-files-jetty-client"});
+        ret.add(new String[]{"browser-capture-unicode-names-jetty-client"});
+        ret.add(new String[]{"browser-capture-whitespace-only-jetty-client"});
+
+        // == Capture of raw request body contents from various browsers ==
 
         // simple form - 2 fields
         ret.add(new String[]{"browser-capture-form1-android-chrome"});
@@ -100,13 +114,14 @@ public class MultiPartCaptureTest
         ret.add(new String[]{"browser-capture-form1-osx-safari"});
 
         // form submitted as shift-jis
+        ret.add(new String[]{"browser-capture-sjis-form-edge"});
+        ret.add(new String[]{"browser-capture-sjis-form-msie"});
+        // TODO: these might be addressable via Issue #2398
         // ret.add(new String[]{"browser-capture-sjis-form-android-chrome"}); // contains html encoded character and unspecified charset defaults to utf-8
         // ret.add(new String[]{"browser-capture-sjis-form-android-firefox"}); // contains html encoded character and unspecified charset defaults to utf-8
         // ret.add(new String[]{"browser-capture-sjis-form-chrome"}); // contains html encoded character and unspecified charset defaults to utf-8
-        ret.add(new String[]{"browser-capture-sjis-form-edge"}); 
         // ret.add(new String[]{"browser-capture-sjis-form-firefox"}); // contains html encoded character and unspecified charset defaults to utf-8
         // ret.add(new String[]{"browser-capture-sjis-form-ios-safari"}); // contains html encoded character and unspecified charset defaults to utf-8
-        ret.add(new String[]{"browser-capture-sjis-form-msie"});
         // ret.add(new String[]{"browser-capture-sjis-form-safari"}); // contains html encoded character and unspecified charset defaults to utf-8
 
         // form submitted as shift-jis (with HTML5 specific hidden _charset_ field)
@@ -133,7 +148,6 @@ public class MultiPartCaptureTest
         ret.add(new String[]{"browser-capture-form-fileupload-alt-chrome"});
         ret.add(new String[]{"browser-capture-form-fileupload-alt-edge"});
         ret.add(new String[]{"browser-capture-form-fileupload-alt-firefox"});
-        // ret.add(new String[]{"browser-capture-form-fileupload-alt-ios-safari"}); // is Sha1sum correct new parser gives same result as old parser
         ret.add(new String[]{"browser-capture-form-fileupload-alt-msie"});
         ret.add(new String[]{"browser-capture-form-fileupload-alt-safari"});
 

jetty-http/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.expected.txt

@@ -0,0 +1,9 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|248
+Request-Header|Content-Type|multipart/form-data; boundary=DHbU6ChASebwm4iE8z9Lakv4ybMmkp
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|1
+Part-ContainsContents|company|bob+%26+frank%27s+shoe+repair

jetty-http/src/test/resources/multipart/browser-capture-company-urlencoded-apache-httpcomp.raw

@@ -1,7 +1,7 @@
---qjIkwQOhaYfC2VEcL5j-9sjEK1FIsYMd5
+--DHbU6ChASebwm4iE8z9Lakv4ybMmkp
 Content-Disposition: form-data; name="company"
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 bob+%26+frank%27s+shoe+repair
---qjIkwQOhaYfC2VEcL5j-9sjEK1FIsYMd5--
+--DHbU6ChASebwm4iE8z9Lakv4ybMmkp--

jetty-http/src/test/resources/multipart/browser-capture-complex-apache-httpcomp.expected.txt

@@ -0,0 +1,15 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|22940
+Request-Header|Content-Type|multipart/form-data; boundary=owr6UQGvVNunA_sx2AsizBtyq_uK-OjsQXrF
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|6
+Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510
+Part-ContainsContents|company|bob & frank's shoe repair
+Part-ContainsContents|power|ꬵо𝗋ⲥ𝖾
+Part-ContainsContents|japanese|オープンソース
+Part-ContainsContents|hello|日食桟橋
+Part-Filename|upload_file|filename
+Part-Sha1sum|upload_file|e75b73644afe9b234d70da9ff225229de68cdff8

jetty-http/src/test/resources/multipart/browser-capture-complex-jetty-client.expected.txt

@@ -0,0 +1,15 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary1275gffetpxz8o0q
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|6
+Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510
+Part-ContainsContents|company|bob & frank's shoe repair
+Part-ContainsContents|power|ꬵо𝗋ⲥ𝖾
+Part-ContainsContents|japanese|オープンソース
+Part-ContainsContents|hello|日食桟橋
+Part-Filename|upload_file|filename
+Part-Sha1sum|upload_file|e75b73644afe9b234d70da9ff225229de68cdff8

jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-apache-httpcomp.expected.txt

@@ -0,0 +1,8 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|1815
+Request-Header|Content-Type|multipart/form-data; boundary=QW3F8Fg64P2J2dpfEKGKlX0Q9QF2a8SK_7YH
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|10

jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.expected.txt

@@ -0,0 +1,8 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary14beb4to333d91v8
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|10

jetty-http/src/test/resources/multipart/browser-capture-duplicate-names-jetty-client.raw

@@ -0,0 +1,51 @@
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+3.14159265358979323846264338327950288419716939937510
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+3.14159
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+3
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+π
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+π
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+%CF%80
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="pi"
+Content-Type: text/plain;charset=UTF-8
+
+π = C/d
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="π"
+Content-Type: text/plain;charset=UTF-8
+
+3.14
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="%CF%80"
+Content-Type: text/plain;charset=UTF-8
+
+Approximately 3.14
+--JettyHttpClientBoundary14beb4to333d91v8
+Content-Disposition: form-data; name="%FE%FF%03%C0"
+Content-Type: text/plain;charset=UTF-8
+
+Approximately 3.14
+--JettyHttpClientBoundary14beb4to333d91v8--

jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-apache-httpcomp.expected.txt

@@ -0,0 +1,11 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|31148
+Request-Header|Content-Type|multipart/form-data; boundary=qqr2YBBR31U4xVib4vaVuIsrwNY1iw
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|169
+Part-ContainsContents|count|168
+Part-ContainsContents|persian-UTF-8|برج بابل
+Part-ContainsContents|persian-CESU-8|برج بابل

jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.expected.txt

@@ -0,0 +1,11 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary1jcfdl0zps9nf362
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|169
+Part-ContainsContents|count|168
+Part-ContainsContents|persian-UTF-8|برج بابل
+Part-ContainsContents|persian-CESU-8|برج بابل

jetty-http/src/test/resources/multipart/browser-capture-encoding-mess-jetty-client.raw

@@ -0,0 +1,846 @@
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-Big5"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-Big5-HKSCS"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-CESU-8"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-EUC-JP"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-EUC-KR"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-GB18030"
+Content-Type: text/plain
+
+<EFBFBD>1<EFBFBD>0<EFBFBD>1<EFBFBD>9<EFBFBD>1<EFBFBD>4 <20>1<EFBFBD>0<EFBFBD>1<EFBFBD>9<EFBFBD>1<EFBFBD>0<EFBFBD>1<EFBFBD>8
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-GB2312"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-GBK"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM-Thai"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM00858"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01140"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01141"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01142"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01143"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01144"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01145"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01146"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01147"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01148"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM01149"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM037"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM1026"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM1047"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM273"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM277"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM278"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM280"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM284"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM285"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM290"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM297"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM420"
+Content-Type: text/plain
+
+Xug@XVX<56>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM424"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM437"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM500"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM775"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM850"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM852"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM855"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM857"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM860"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM861"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM862"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM863"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM864"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM865"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM866"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM868"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM869"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM870"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM871"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-IBM918"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-2022-JP"
+Content-Type: text/plain
+
+？？？ ？？？？
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-2022-JP-2"
+Content-Type: text/plain
+
+？？？ ？？？？
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-2022-KR"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-1"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-13"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-15"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-2"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-3"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-4"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-5"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-6"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-7"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-8"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-ISO-8859-9"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-JIS_X0201"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-JIS_X0212-1990"
+Content-Type: text/plain
+
+"D"D"D"D"D"D"D"D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-KOI8-R"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-KOI8-U"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-Shift_JIS"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-TIS-620"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-US-ASCII"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-16"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD>(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-16BE"
+Content-Type: text/plain
+
+(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-16LE"
+Content-Type: text/plain
+
+(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-32"
+Content-Type: text/plain
+
+(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-32BE"
+Content-Type: text/plain
+
+(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-32LE"
+Content-Type: text/plain
+
+(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-UTF-8"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1250"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1251"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1252"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1253"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1254"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1255"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1256"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1257"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-1258"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-windows-31j"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-Big5-HKSCS-2001"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-Big5-Solaris"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-euc-jp-linux"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-EUC-TW"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-eucJP-Open"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1006"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1025"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1046"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1097"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1098"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1112"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1122"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1123"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1124"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1166"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1364"
+Content-Type: text/plain
+
+ooo@oooo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1381"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM1383"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM300"
+Content-Type: text/plain
+
+BoBoBoBoBoBoBoBo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM33722"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM737"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM833"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM834"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM856"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM874"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM875"
+Content-Type: text/plain
+
+???@????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM921"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM922"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM930"
+Content-Type: text/plain
+
+ooo@oooo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM933"
+Content-Type: text/plain
+
+ooo@oooo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM935"
+Content-Type: text/plain
+
+ooo@oooo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM937"
+Content-Type: text/plain
+
+ooo@oooo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM939"
+Content-Type: text/plain
+
+ooo@oooo
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM942"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM942C"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM943"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM943C"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM948"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM949"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM949C"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM950"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM964"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-IBM970"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-ISCII91"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-ISO-2022-CN-CNS"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-ISO-2022-CN-GB"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-iso-8859-11"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-JIS0208"
+Content-Type: text/plain
+
+!)!)!)!)!)!)!)!)
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-Johab"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacArabic"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacCentralEurope"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacCroatian"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacCyrillic"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacDingbat"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacGreek"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacHebrew"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacIceland"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacRoman"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacRomania"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacSymbol"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacThai"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacTurkish"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MacUkraine"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MS932_0213"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MS950-HKSCS"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-MS950-HKSCS-XP"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-mswin-936"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-PCK"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-SJIS_0213"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-UTF-16LE-BOM"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD>(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-X-UTF-32BE-BOM"
+Content-Type: text/plain
+
+<00><>(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-X-UTF-32LE-BOM"
+Content-Type: text/plain
+
+<EFBFBD><EFBFBD>(1, ('(D
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-windows-50220"
+Content-Type: text/plain
+
+？？？ ？？？？
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-windows-50221"
+Content-Type: text/plain
+
+？？？ ？？？？
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-windows-874"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-windows-949"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-windows-950"
+Content-Type: text/plain
+
+??? ????
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="persian-x-windows-iso2022jp"
+Content-Type: text/plain
+
+？？？ ？？？？
+--JettyHttpClientBoundary1jcfdl0zps9nf362
+Content-Disposition: form-data; name="count"
+Content-Type: text/plain;charset=UTF-8
+
+168
+--JettyHttpClientBoundary1jcfdl0zps9nf362--

jetty-http/src/test/resources/multipart/browser-capture-form-fileupload-alt-ios-safari.expected.txt

@@ -1,18 +0,0 @@
-Request-Header|Accept|text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
-Request-Header|Accept-Encoding|gzip, deflate
-Request-Header|Accept-Language|en-us
-Request-Header|Connection|keep-alive
-Request-Header|Content-Length|22359
-Request-Header|Content-Type|multipart/form-data; boundary=----WebKitFormBoundaryb59mxzeFXckWXDD0
-Request-Header|Host|192.168.0.119:9090
-Request-Header|Origin|http://192.168.0.119:9090
-Request-Header|Referer|http://192.168.0.119:9090/form-fileupload-multi.html
-Request-Header|Upgrade-Insecure-Requests|1
-Request-Header|User-Agent|Mozilla/5.0 (iPad; CPU OS 11_2_6 like Mac OS X) AppleWebKit/604.5.6 (KHTML, like Gecko) Version/11.0 Mobile/15D100 Safari/604.1
-Parts-Count|4
-Part-ContainsContents|description|the larger icon
-Part-ContainsContents|alternate|Text.raw
-Part-Filename|file|36037FD9-841C-4803-AA7E-354EF727AA06.png
-Part-Sha1sum|file|e75b73644afe9b234d70da9ff225229de68cdff8
-Part-Filename|file-alt|Text File.txt
-Part-Sha1sum|file-alt|5fb031816a27d80cc88c390819addab0ec3c189b

jetty-http/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.expected.txt

@@ -0,0 +1,12 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|1203
+Request-Header|Content-Type|multipart/form-data; boundary=Cku4UvJrPFCXkXjge2a2Y2sgq1bbOa
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|4
+Part-ContainsContents|reporter|<user@company.com>
+Part-ContainsContents|timestamp|2018-03-21T18:52:18+00:00
+Part-ContainsContents|comments|this couldn't be parsed
+Part-ContainsContents|attachment|banana

jetty-http/src/test/resources/multipart/browser-capture-nested-apache-httpcomp.raw

@@ -1,42 +1,42 @@
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x
+--Cku4UvJrPFCXkXjge2a2Y2sgq1bbOa
 Content-Disposition: form-data; name="reporter"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 <user@company.com>
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x
+--Cku4UvJrPFCXkXjge2a2Y2sgq1bbOa
 Content-Disposition: form-data; name="timestamp"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 2018-03-21T18:52:18+00:00
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x
+--Cku4UvJrPFCXkXjge2a2Y2sgq1bbOa
 Content-Disposition: form-data; name="comments"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 this couldn't be parsed
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x
+--Cku4UvJrPFCXkXjge2a2Y2sgq1bbOa
 Content-Disposition: form-data; name="attachment"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGj
+--nM8_n8ugj9L3fIomqyU6h9Wpb6Wt-3w
 Content-Disposition: form-data; name="fruit"
 
 banana
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGj
+--nM8_n8ugj9L3fIomqyU6h9Wpb6Wt-3w
 Content-Disposition: form-data; name="color"
 
 yellow
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGj
+--nM8_n8ugj9L3fIomqyU6h9Wpb6Wt-3w
 Content-Disposition: form-data; name="cost"
 
 $0.12 USG
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGj
+--nM8_n8ugj9L3fIomqyU6h9Wpb6Wt-3w
 Content-Disposition: form-data; name="comments"
 
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGj--
+--divc688gD49-GaZcLkprfUb8-PWOjF3Z
+--nM8_n8ugj9L3fIomqyU6h9Wpb6Wt-3w--
 
---kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x--
+--Cku4UvJrPFCXkXjge2a2Y2sgq1bbOa--

jetty-http/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.expected.txt

@@ -0,0 +1,12 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|1577
+Request-Header|Content-Type|multipart/form-data; boundary=xDeLGHDDsXrlJSXfqDmg5IRop7auqTTBXuI
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|4
+Part-ContainsContents|reporter|<user@company.com>
+Part-ContainsContents|timestamp|2018-03-21T19:00:18+00:00
+Part-ContainsContents|comments|this also couldn't be parsed
+Part-ContainsContents|attachment|cherry

jetty-http/src/test/resources/multipart/browser-capture-nested-binary-apache-httpcomp.raw

@@ -1,50 +1,50 @@
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8-
+--xDeLGHDDsXrlJSXfqDmg5IRop7auqTTBXuI
 Content-Disposition: form-data; name="reporter"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 <user@company.com>
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8-
+--xDeLGHDDsXrlJSXfqDmg5IRop7auqTTBXuI
 Content-Disposition: form-data; name="timestamp"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 2018-03-21T19:00:18+00:00
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8-
+--xDeLGHDDsXrlJSXfqDmg5IRop7auqTTBXuI
 Content-Disposition: form-data; name="comments"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 this also couldn't be parsed
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8-
+--xDeLGHDDsXrlJSXfqDmg5IRop7auqTTBXuI
 Content-Disposition: form-data; name="attachment"
 Content-Type: application/octet-stream
 Content-Transfer-Encoding: binary
 
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0v
+--GiQ7DQPSJdaP5c43_Zd1P6xVJTQVLzZ8T9ovx
 Content-Disposition: form-data; name="fruit"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 cherry
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0v
+--GiQ7DQPSJdaP5c43_Zd1P6xVJTQVLzZ8T9ovx
 Content-Disposition: form-data; name="color"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 red
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0v
+--GiQ7DQPSJdaP5c43_Zd1P6xVJTQVLzZ8T9ovx
 Content-Disposition: form-data; name="cost"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
 $1.20 USG
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0v
+--GiQ7DQPSJdaP5c43_Zd1P6xVJTQVLzZ8T9ovx
 Content-Disposition: form-data; name="comments"
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 8bit
 
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8-
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0v--
+--gq4lBOlNh8FRiH6MLw4GaWE40UC-GeDRTy8bF
+--GiQ7DQPSJdaP5c43_Zd1P6xVJTQVLzZ8T9ovx--
 
---94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8---
+--xDeLGHDDsXrlJSXfqDmg5IRop7auqTTBXuI--

jetty-http/src/test/resources/multipart/browser-capture-nested-jetty-client.expected.txt

@@ -0,0 +1,12 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary1uz60vid2bq7x1t9
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|4
+Part-ContainsContents|reporter|<user@company.com>
+Part-ContainsContents|timestamp|2018-03-21T18:52:18+00:00
+Part-ContainsContents|comments|this couldn't be parsed
+Part-ContainsContents|attachment|banana

jetty-http/src/test/resources/multipart/browser-capture-nested-jetty-client.raw

@@ -0,0 +1,42 @@
+--JettyHttpClientBoundary1uz60vid2bq7x1t9
+Content-Disposition: form-data; name="reporter"
+Content-Type: text/plain;charset=UTF-8
+
+<user@company.com>
+--JettyHttpClientBoundary1uz60vid2bq7x1t9
+Content-Disposition: form-data; name="timestamp"
+Content-Type: text/plain;charset=UTF-8
+
+2018-03-21T18:52:18+00:00
+--JettyHttpClientBoundary1uz60vid2bq7x1t9
+Content-Disposition: form-data; name="comments"
+Content-Type: text/plain;charset=UTF-8
+
+this couldn't be parsed
+--JettyHttpClientBoundary1uz60vid2bq7x1t9
+Content-Disposition: form-data; name="attachment"; filename="sample"
+Content-Type: multipart/form-data; boundary=JettyHttpClientBoundary10bb1gdlzug0xmmi
+
+--JettyHttpClientBoundary10bb1gdlzug0xmmi
+Content-Disposition: form-data; name="fruit"
+Content-Type: text/plain;charset=UTF-8
+
+banana
+--JettyHttpClientBoundary10bb1gdlzug0xmmi
+Content-Disposition: form-data; name="color"
+Content-Type: text/plain;charset=UTF-8
+
+yellow
+--JettyHttpClientBoundary10bb1gdlzug0xmmi
+Content-Disposition: form-data; name="cost"
+Content-Type: text/plain;charset=UTF-8
+
+$0.12 USD
+--JettyHttpClientBoundary10bb1gdlzug0xmmi
+Content-Disposition: form-data; name="comments"
+Content-Type: text/plain;charset=UTF-8
+
+--gx1KGV2f8WMHHwtWog9AFqjD3IGHzEvk
+--JettyHttpClientBoundary10bb1gdlzug0xmmi--
+
+--JettyHttpClientBoundary1uz60vid2bq7x1t9--

jetty-http/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.expected.txt

@@ -0,0 +1,9 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|173
+Request-Header|Content-Type|multipart/form-data; boundary=xE8WoYDcbqAfj08bxPk669iK22hMMlZL
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|1
+Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510

jetty-http/src/test/resources/multipart/browser-capture-number-only-apache-httpcomp.raw

@@ -1,5 +1,5 @@
---RjYiyHVV9Phv7tYylzT1f94fvTC-s7oNKwB9_Y
+--xE8WoYDcbqAfj08bxPk669iK22hMMlZL
 Content-Disposition: form-data; name="pi"
 
 3.14159265358979323846264338327950288419716939937510
---RjYiyHVV9Phv7tYylzT1f94fvTC-s7oNKwB9_Y--
+--xE8WoYDcbqAfj08bxPk669iK22hMMlZL--

jetty-http/src/test/resources/multipart/browser-capture-number-only-jetty-client.expected.txt

@@ -0,0 +1,12 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary1shlqpw2yahae6jf
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|1
+# Start of sequence
+Part-ContainsContents|pi|3.14159 26535 89793 23846 26433 83279 50288
+# End of sequence
+Part-ContainsContents|pi|81592 05600 10165 52563 7567

jetty-http/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.expected.txt

@@ -0,0 +1,9 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|240
+Request-Header|Content-Type|multipart/form-data; boundary=L8vdau8TpP0o-AYJDjCuYFQYnjB5gcHIFyap
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|1
+Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510

jetty-http/src/test/resources/multipart/browser-capture-number-only2-apache-httpcomp.raw

@@ -1,7 +1,7 @@
---P6Uyk-Vikfbk_NqTfVF4DwNXrIxpN451pD1
+--L8vdau8TpP0o-AYJDjCuYFQYnjB5gcHIFyap
 Content-Disposition: form-data; name="pi"
 Content-Type: text/plain
 Content-Transfer-Encoding: 8bit
 
 3.14159265358979323846264338327950288419716939937510
---P6Uyk-Vikfbk_NqTfVF4DwNXrIxpN451pD1--
+--L8vdau8TpP0o-AYJDjCuYFQYnjB5gcHIFyap--

jetty-http/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.expected.txt

@@ -0,0 +1,10 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|406
+Request-Header|Content-Type|multipart/form-data; boundary=u7tfLQaHJEHHUJjnVDbFdc_Oqz4jmkA25mgWd
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|2
+Part-ContainsContents|japanese|オープンソース
+Part-ContainsContents|hello|日食桟橋

jetty-http/src/test/resources/multipart/browser-capture-sjis-apache-httpcomp.raw

@@ -1,13 +1,13 @@
---VA2isIGmYNkgC3qrrGXnlQcWO17WB3a4npVQey
+--u7tfLQaHJEHHUJjnVDbFdc_Oqz4jmkA25mgWd
 Content-Disposition: form-data; name="japanese"
 Content-Type: text/plain; charset=Shift_JIS
 Content-Transfer-Encoding: 8bit
 
-健治
---VA2isIGmYNkgC3qrrGXnlQcWO17WB3a4npVQey
+オープンソース
+--u7tfLQaHJEHHUJjnVDbFdc_Oqz4jmkA25mgWd
 Content-Disposition: form-data; name="hello"
 Content-Type: text/plain; charset=Shift_JIS
 Content-Transfer-Encoding: 8bit
 
-ャユ?タ
---VA2isIGmYNkgC3qrrGXnlQcWO17WB3a4npVQey--
+日食桟橋
+--u7tfLQaHJEHHUJjnVDbFdc_Oqz4jmkA25mgWd--

jetty-http/src/test/resources/multipart/browser-capture-sjis-jetty-client.expected.txt

@@ -0,0 +1,10 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundaryny8fndkswj5ot6hx
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|2
+Part-ContainsContents|japanese|オープンソース
+Part-ContainsContents|hello|日食桟橋

jetty-http/src/test/resources/multipart/browser-capture-sjis-jetty-client.raw

@@ -0,0 +1,11 @@
+--JettyHttpClientBoundaryny8fndkswj5ot6hx
+Content-Disposition: form-data; name="japanese"
+Content-Type: text/plain; charset=Shift-JIS
+
+オープンソース
+--JettyHttpClientBoundaryny8fndkswj5ot6hx
+Content-Disposition: form-data; name="hello"
+Content-Type: text/plain; charset=Shift-JIS
+
+日食桟橋
+--JettyHttpClientBoundaryny8fndkswj5ot6hx--

jetty-http/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.expected.txt

@@ -0,0 +1,11 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|798
+Request-Header|Content-Type|multipart/form-data; boundary=z5xWs05oeiE0TAdFlrrlAX5RSgHrHzVcgskrru
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|4
+Part-ContainsContents|and "I" quote|Value 1
+Part-ContainsContents|and+%22I%22+quote|Value 2
+Part-ContainsContents|value"; what="whoa"|Value 3

jetty-http/src/test/resources/multipart/browser-capture-strange-quoting-apache-httpcomp.raw

@@ -1,26 +1,26 @@
---tR61vgdxSzzv2FDycET2lt-OUZ1IW1GqA
+--z5xWs05oeiE0TAdFlrrlAX5RSgHrHzVcgskrru
 Content-Disposition: form-data; name="and \"I\" quote"
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Value 1
---tR61vgdxSzzv2FDycET2lt-OUZ1IW1GqA
+--z5xWs05oeiE0TAdFlrrlAX5RSgHrHzVcgskrru
 Content-Disposition: form-data; name="and+%22I%22+quote"
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Value 2
---tR61vgdxSzzv2FDycET2lt-OUZ1IW1GqA
+--z5xWs05oeiE0TAdFlrrlAX5RSgHrHzVcgskrru
 Content-Disposition: form-data; name="value\"; what=\"whoa\""
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Value 3
---tR61vgdxSzzv2FDycET2lt-OUZ1IW1GqA
+--z5xWs05oeiE0TAdFlrrlAX5RSgHrHzVcgskrru
 Content-Disposition: form-data; name="other\";	
 what=\"Something\""
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Value 4
---tR61vgdxSzzv2FDycET2lt-OUZ1IW1GqA--
+--z5xWs05oeiE0TAdFlrrlAX5RSgHrHzVcgskrru--

jetty-http/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.expected.txt

@@ -0,0 +1,15 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|737
+Request-Header|Content-Type|multipart/form-data; boundary=B8x_673_DRSeYGTpUMgof-qN1nircWQA
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|3
+Part-ContainsContents|text|text default
+Part-ContainsContents|file1|Content of a.txt
+Part-ContainsContents|file2|<!DOCTYPE html><title>Content of a.html
+Part-Filename|file1|a.txt
+Part-Filename|file2|a.html
+Part-Sha1sum|file1|588A0F273CB5AFE9C8D76DD081812E672F2061E2
+Part-Sha1sum|file2|9A9005159AB90A6D2D9BACB5414EFE932F0CED85

jetty-http/src/test/resources/multipart/browser-capture-text-files-apache-httpcomp.raw

@@ -1,11 +1,11 @@
---ny9C5eIZL7fsfPY9ONPy8Lxb6tkgEv1
+--B8x_673_DRSeYGTpUMgof-qN1nircWQA
 Content-Disposition: form-data; name="text"
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 text default
 
---ny9C5eIZL7fsfPY9ONPy8Lxb6tkgEv1
+--B8x_673_DRSeYGTpUMgof-qN1nircWQA
 Content-Type: text/plain; charset=UTF-8
 X-SHA1: 588A0F273CB5AFE9C8D76DD081812E672F2061E2
 Content-Disposition: form-data; name="file1"; filename="a.txt"
@@ -13,11 +13,11 @@ Content-Transfer-Encoding: binary
 
 Content of a.txt
 
---ny9C5eIZL7fsfPY9ONPy8Lxb6tkgEv1
+--B8x_673_DRSeYGTpUMgof-qN1nircWQA
 Content-Type: text/html; charset=UTF-8
 X-SHA1: 9A9005159AB90A6D2D9BACB5414EFE932F0CED85
 Content-Disposition: form-data; name="file2"; filename="a.html"
 Content-Transfer-Encoding: binary
 
 <!DOCTYPE html><title>Content of a.html.</title>
---ny9C5eIZL7fsfPY9ONPy8Lxb6tkgEv1--
+--B8x_673_DRSeYGTpUMgof-qN1nircWQA--

jetty-http/src/test/resources/multipart/browser-capture-text-files-jetty-client.expected.txt

@@ -1,4 +1,10 @@
-Content-Type|multipart/form-data; boundary="ny9C5eIZL7fsfPY9ONPy8Lxb6tkgEv1"
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary1e87p8a551psw1al
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
 Parts-Count|3
 Part-ContainsContents|text|text default
 Part-ContainsContents|file1|Content of a.txt

jetty-http/src/test/resources/multipart/browser-capture-text-files-jetty-client.raw

@@ -0,0 +1,20 @@
+--JettyHttpClientBoundary1e87p8a551psw1al
+Content-Disposition: form-data; name="text"
+Content-Type: text/plain;charset=UTF-8
+
+text default
+
+--JettyHttpClientBoundary1e87p8a551psw1al
+Content-Disposition: form-data; name="file1"; filename="a.txt"
+Content-Type: application/octet-stream
+X-SHA1: 588A0F273CB5AFE9C8D76DD081812E672F2061E2
+
+Content of a.txt
+
+--JettyHttpClientBoundary1e87p8a551psw1al
+Content-Disposition: form-data; name="file2"; filename="a.html"
+Content-Type: application/octet-stream
+X-SHA1: 9A9005159AB90A6D2D9BACB5414EFE932F0CED85
+
+<!DOCTYPE html><title>Content of a.html.</title>
+--JettyHttpClientBoundary1e87p8a551psw1al--

jetty-http/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.expected.txt

@@ -0,0 +1,11 @@
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|475
+Request-Header|Content-Type|multipart/form-data; boundary=yRxfRSltW63lJPc9oHOOVyCn-SmDG6i4Ts9M4E6
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
+Parts-Count|2
+Part-ContainsContents|こんにちは世界|Greetings 1
+Part-ContainsContents|%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF%E4%B8%96%E7%95%8C|Greetings 2
+

jetty-http/src/test/resources/multipart/browser-capture-unicode-names-apache-httpcomp.raw

@@ -1,13 +1,13 @@
---1R40qTSaEjDJPcArQiccT7vdpp0l02248R
+--yRxfRSltW63lJPc9oHOOVyCn-SmDG6i4Ts9M4E6
 Content-Disposition: form-data; name="こんにちは世界"
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Greetings 1
---1R40qTSaEjDJPcArQiccT7vdpp0l02248R
+--yRxfRSltW63lJPc9oHOOVyCn-SmDG6i4Ts9M4E6
 Content-Disposition: form-data; name="%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF%E4%B8%96%E7%95%8C"
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Greetings 2
---1R40qTSaEjDJPcArQiccT7vdpp0l02248R--
+--yRxfRSltW63lJPc9oHOOVyCn-SmDG6i4Ts9M4E6--

jetty-http/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.expected.txt

@@ -0,0 +1,11 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary9iv9jofnq5dkzmgl
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|2
+Part-ContainsContents|こんにちは世界|Greetings 1
+Part-ContainsContents|%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF%E4%B8%96%E7%95%8C|Greetings 2
+

jetty-http/src/test/resources/multipart/browser-capture-unicode-names-jetty-client.raw

@@ -0,0 +1,11 @@
+--JettyHttpClientBoundary9iv9jofnq5dkzmgl
+Content-Disposition: form-data; name="こんにちは世界"
+Content-Type: text/plain
+
+Greetings 1
+--JettyHttpClientBoundary9iv9jofnq5dkzmgl
+Content-Disposition: form-data; name="%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF%E4%B8%96%E7%95%8C"
+Content-Type: text/plain
+
+Greetings 2
+--JettyHttpClientBoundary9iv9jofnq5dkzmgl--

jetty-http/src/test/resources/multipart/browser-capture-whitespace-only-jetty-client.expected.txt

@@ -0,0 +1,10 @@
+Request-Header|Accept-Encoding|gzip
+Request-Header|Connection|close
+Request-Header|Content-Type|multipart/form-data; boundary=JettyHttpClientBoundary1evz7ehqg8tvo10h
+Request-Header|Host|localhost:9090
+Request-Header|Transfer-Encoding|chunked
+Request-Header|User-Agent|Jetty/9.4.9.v20180320
+Request-Header|X-BrowserId|jetty-client
+Parts-Count|1
+Part-Filename|whitespace|whitespace.txt
+Part-Sha1sum|whitespace|353E2CCDDE1069706B950414B230B6C047F98491

jetty-http/src/test/resources/multipart/browser-capture-zalgo-text-plain-apache-httpcomp.expected.txt

@@ -1,8 +1,12 @@
-Content-Type|multipart/form-data; boundary="UuAU1liVuDVE7wfJUYE72PUF9DZafZ"
+Request-Header|Accept-Encoding|gzip,deflate
+Request-Header|Connection|keep-alive
+Request-Header|Content-Length|1870
+Request-Header|Content-Type|multipart/form-data; boundary=V9oY7Ug2J-n4sFXLWdb7yd2LtU0hdK36ejhKYh
+Request-Header|Host|localhost:9090
+Request-Header|User-Agent|Apache-HttpClient/4.5.5 (Java/1.8.0_162)
+Request-Header|X-BrowserId|apache-httpcomp
 Parts-Count|4
 Part-ContainsContents|zalgo-8|y͔͕͍o̪̞͎̥͇̤̕u'̛̰̫̳̰v̧̘̪̠̟̟e̥͈̱ ̥̠͇͎͕̜s̤e̺e̙ͅņ̜ ̲̟͝za̴͖̱̲͈̘l͖̖͓̙̮͔g͕̞͖͘o͕̤͈̗ ̯̲̹̲͓b͙͟e̞͎̜̗͈͉̭͞f̸or̰̩e̡̝̺,̸͕̙̥̼͇̜ ̪͇̹r̘̪ͅị͔̥͈ͅg̠̟̯͖̦͇ht͖̪͍͚̖͡?͙̝͖̞
 Part-ContainsContents|zalgo-16|y͔͕͍o̪̞͎̥͇̤̕u'̛̰̫̳̰v̧̘̪̠̟̟e̥͈̱ ̥̠͇͎͕̜s̤e̺e̙ͅņ̜ ̲̟͝za̴͖̱̲͈̘l͖̖͓̙̮͔g͕̞͖͘o͕̤͈̗ ̯̲̹̲͓b͙͟e̞͎̜̗͈͉̭͞f̸or̰̩e̡̝̺,̸͕̙̥̼͇̜ ̪͇̹r̘̪ͅị͔̥͈ͅg̠̟̯͖̦͇ht͖̪͍͚̖͡?͙̝͖̞
 Part-ContainsContents|zalgo-16-be|y͔͕͍o̪̞͎̥͇̤̕u'̛̰̫̳̰v̧̘̪̠̟̟e̥͈̱ ̥̠͇͎͕̜s̤e̺e̙ͅņ̜ ̲̟͝za̴͖̱̲͈̘l͖̖͓̙̮͔g͕̞͖͘o͕̤͈̗ ̯̲̹̲͓b͙͟e̞͎̜̗͈͉̭͞f̸or̰̩e̡̝̺,̸͕̙̥̼͇̜ ̪͇̹r̘̪ͅị͔̥͈ͅg̠̟̯͖̦͇ht͖̪͍͚̖͡?͙̝͖̞
 Part-ContainsContents|zalgo-16-le|y͔͕͍o̪̞͎̥͇̤̕u'̛̰̫̳̰v̧̘̪̠̟̟e̥͈̱ ̥̠͇͎͕̜s̤e̺e̙ͅņ̜ ̲̟͝za̴͖̱̲͈̘l͖̖͓̙̮͔g͕̞͖͘o͕̤͈̗ ̯̲̹̲͓b͙͟e̞͎̜̗͈͉̭͞f̸or̰̩e̡̝̺,̸͕̙̥̼͇̜ ̪͇̹r̘̪ͅị͔̥͈ͅg̠̟̯͖̦͇ht͖̪͍͚̖͡?͙̝͖̞
-
-

jetty-http/src/test/resources/multipart/multipart-complex.expected.txt

@@ -1,9 +0,0 @@
-Content-Type|multipart/form-data; boundary="PMyKOsh8JrSZm-rUF8EJej42yqbh-UWw9FG-"
-Parts-Count|6
-Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510
-Part-ContainsContents|company|bob & frank's shoe repair
-Part-ContainsContents|power|ꬵо𝗋ⲥ𝖾
-Part-ContainsContents|japanese|健治
-Part-ContainsContents|hello|ャユ戆タ
-Part-Filename|upload_file|filename
-Part-Sha1sum|upload_file|e75b73644afe9b234d70da9ff225229de68cdff8

jetty-http/src/test/resources/multipart/multipart-duplicate-names-1.expected.txt

@@ -1,2 +0,0 @@
-Content-Type|multipart/form-data; boundary="mToTaXZk2RQZb6TrQRLOgqW-44MPpVbs5wyJTlyl"
-Parts-Count|10

jetty-http/src/test/resources/multipart/multipart-encoding-mess.expected.txt

@@ -1,4 +0,0 @@
-Content-Type|multipart/form-data; boundary="CVnTR46ddexmZjsh1ORHg9QbCOiLhUYl"
-Parts-Count|168
-Part-ContainsContents|persian-UTF-8|برج بابل
-Part-ContainsContents|persian-CESU-8|برج بابل

jetty-http/src/test/resources/multipart/multipart-inside-itself-binary.expected.txt

@@ -1,6 +0,0 @@
-Content-Type|multipart/form-data; boundary="94GJ2MW4vpjh92qj-CHjUUIwb9X8Y2LqkU2Yxn0vTU2oHy5jk6_Kpxn2aE9EokEiRGox4eWfAYP8-"
-Parts-Count|4
-Part-ContainsContents|reporter|<user@company.com>
-Part-ContainsContents|timestamp|2018-03-21T19:00:18+00:00
-Part-ContainsContents|comments|this also couldn't be parsed
-Part-ContainsContents|attachment|cherry

jetty-http/src/test/resources/multipart/multipart-inside-itself.expected.txt

@@ -1,6 +0,0 @@
-Content-Type|multipart/form-data; boundary="kCFSwstIsIZkZtQ5JM7193kJYcK5WkyvoxsGjx5eCuVFbaeUZ9oK57JCp_p5wP86S5nY4re5x"
-Parts-Count|4
-Part-ContainsContents|reporter|<user@company.com>
-Part-ContainsContents|timestamp|2018-03-21T18:52:18+00:00
-Part-ContainsContents|comments|this couldn't be parsed
-Part-ContainsContents|attachment|banana

jetty-http/src/test/resources/multipart/multipart-number-browser.expected.txt

@@ -1,3 +0,0 @@
-Content-Type|multipart/form-data; boundary="RjYiyHVV9Phv7tYylzT1f94fvTC-s7oNKwB9_Y"
-Parts-Count|1
-Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510

jetty-http/src/test/resources/multipart/multipart-number-strict.expected.txt

@@ -1,3 +0,0 @@
-Content-Type|multipart/form-data; boundary="P6Uyk-Vikfbk_NqTfVF4DwNXrIxpN451pD1"
-Parts-Count|1
-Part-ContainsContents|pi|3.14159265358979323846264338327950288419716939937510

jetty-http/src/test/resources/multipart/multipart-sjis.expected.txt

@@ -1,4 +0,0 @@
-Content-Type|multipart/form-data; boundary="VA2isIGmYNkgC3qrrGXnlQcWO17WB3a4npVQey"
-Parts-Count|2
-Part-ContainsContents|japanese|健治
-Part-ContainsContents|hello|ャユ戆タ

jetty-http/src/test/resources/multipart/multipart-strange-quoting.expected.txt

@@ -1,5 +0,0 @@
-Content-Type|multipart/form-data; boundary="tR61vgdxSzzv2FDycET2lt-OUZ1IW1GqA"
-Parts-Count|4
-Part-ContainsContents|and "I" quote|Value 1
-Part-ContainsContents|and+%22I%22+quote|Value 2
-Part-ContainsContents|value"; what="whoa"|Value 3

jetty-http/src/test/resources/multipart/multipart-unicode-names.expected.txt

@@ -1,5 +0,0 @@
-Content-Type|multipart/form-data; boundary="1R40qTSaEjDJPcArQiccT7vdpp0l02248R"
-Parts-Count|2
-Part-ContainsContents|こんにちは世界|Greetings 1
-Part-ContainsContents|%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF%E4%B8%96%E7%95%8C|Greetings 2
-

jetty-http/src/test/resources/multipart/multipart-x-www-form-urlencoded.expected.txt

@@ -1,5 +0,0 @@
-Content-Type|multipart/form-data; boundary="qjIkwQOhaYfC2VEcL5j-9sjEK1FIsYMd5"
-Parts-Count|1
-Part-ContainsContents|company|bob & frank's shoe repair
-
-

jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java

@@ -170,14 +170,14 @@ public class ResourceHandlerTest
         assertThat(response.getContent(),containsString("big.txt"));
         assertThat(response.getContent(),containsString("bigger.txt"));
         assertThat(response.getContent(),containsString("directory"));
-        assertThat(response.getContent(),containsString("simple.raw"));
+        assertThat(response.getContent(),containsString("simple.txt"));
     }
 
     @Test
     public void testHeaders() throws Exception
     {
         HttpTester.Response response = HttpTester.parseResponse(
-            _local.getResponse("GET /resource/simple.raw HTTP/1.0\r\n\r\n"));
+            _local.getResponse("GET /resource/simple.txt HTTP/1.0\r\n\r\n"));
         assertThat(response.getStatus(),equalTo(200));
         assertThat(response.get(CONTENT_TYPE),equalTo("text/plain"));
         assertThat(response.get(LAST_MODIFIED),Matchers.notNullValue());