Merge branch '__rultor'

yegor256 · Jan 18, 2016 · 3223ab8 · 3223ab8
2 parents a750b64 + 9fd6c11
commit 3223ab8
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/src/main/java/org/takes/rq/RqMultipart.java b/src/main/java/org/takes/rq/RqMultipart.java
@@ -249,11 +249,15 @@ private Request make(final byte[] boundary) throws IOException {
             } finally {
                 channel.close();
             }
-            return new RqLive(
-                new CapInputStream(
-                    new FileInputStream(file),
-                    file.length()
-                )
+            return new RqWithHeader(
+                new RqLive(
+                    new CapInputStream(
+                        new FileInputStream(file),
+                        file.length()
+                    )
+                ),
+                "Content-Length",
+                String.valueOf(file.length())
             );
         }
         /**

diff --git a/src/test/java/org/takes/rq/RqMultipartTest.java b/src/test/java/org/takes/rq/RqMultipartTest.java
@@ -44,6 +44,7 @@
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
+import org.takes.facets.hamcrest.HmRqHeader;
 import org.takes.http.FtRemote;
 import org.takes.misc.PerformanceTests;
 import org.takes.rs.RsText;
@@ -472,6 +473,40 @@ public void notDistortContent() throws IOException {
         temp.delete();
     }
 
+    /**
+     * RqMultipart.Base can produce parts with Content-Length.
+     * @throws IOException If some problem inside
+     */
+    @Test
+    public void producesPartsWithContentLength() throws IOException {
+        final RqMultipart.Base multipart = new RqMultipart.Base(
+            new RqFake(
+                Arrays.asList(
+                    "POST /h?a=4 HTTP/1.1",
+                    "Host: rtw.example.com",
+                    "Content-Type: multipart/form-data; boundary=AaB01x",
+                    "Content-Length: 100007"
+                ),
+                Joiner.on("\r\n").join(
+                    "--AaB01x",
+                    "Content-Disposition: form-data; name=\"t2\"",
+                    "",
+                    "447 N Wolfe Rd, Sunnyvale, CA 94085",
+                    "--AaB01x"
+                )
+            )
+        );
+        MatcherAssert.assertThat(
+            multipart.part("t2")
+                .iterator()
+                .next(),
+            new HmRqHeader(
+                "content-length",
+                "102"
+            )
+        );
+    }
+
     /**
      * Format Content-Disposition header.
      * @param dsp Disposition