From a52520941f518ade756a73797e875722d1ba344b Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Wed, 18 Jul 2018 07:34:59 +0800
Subject: [PATCH] multipart: Force a CRLF at the end of request

---
 src/multipart_.rs  | 8 ++++----
 tests/multipart.rs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/multipart_.rs b/src/multipart_.rs
index ae16987..552150a 100644
--- a/src/multipart_.rs
+++ b/src/multipart_.rs
@@ -108,7 +108,7 @@ impl Form {
         }
         // If there is a at least one field there is a special boundary for the very last field.
         if self.fields.len() != 0 {
-            length += 2 + self.boundary.len() as u64 + 2
+            length += 2 + self.boundary.len() as u64 + 4
         }
         Some(length)
     }
@@ -271,7 +271,7 @@ impl Reader {
                 Some(Box::new(reader))
             } else {
                 Some(Box::new(reader.chain(Cursor::new(
-                    format!("--{}--", self.form.boundary),
+                    format!("--{}--\r\n", self.form.boundary),
                 ))))
             }
         } else {
@@ -377,7 +377,7 @@ mod tests {
                         \r\n\
                         --boundary\r\n\
                         Content-Disposition: form-data; name=\"key3\"; filename=\"filename\"\r\n\r\n\
-                        value3\r\n--boundary--";
+                        value3\r\n--boundary--\r\n";
         form.reader().read_to_end(&mut output).unwrap();
         // These prints are for debug purposes in case the test fails
         println!(
@@ -413,7 +413,7 @@ mod tests {
                         value2\r\n\
                         --boundary\r\n\
                         Content-Disposition: form-data; name=\"key3\"; filename=\"filename\"\r\n\r\n\
-                        value3\r\n--boundary--";
+                        value3\r\n--boundary--\r\n";
         form.reader().read_to_end(&mut output).unwrap();
         // These prints are for debug purposes in case the test fails
         println!(
diff --git a/tests/multipart.rs b/tests/multipart.rs
index d9b6a41..bcfaa23 100644
--- a/tests/multipart.rs
+++ b/tests/multipart.rs
@@ -15,7 +15,7 @@ fn test_multipart() {
         --{0}\r\n\
         Content-Disposition: form-data; name=\"foo\"\r\n\r\n\
         bar\r\n\
-        --{0}--\
+        --{0}--\r\n\
     ", form.boundary());
 
     let server = server! {
@@ -24,7 +24,7 @@ fn test_multipart() {
             user-agent: $USERAGENT\r\n\
             accept: */*\r\n\
             content-type: multipart/form-data; boundary={}\r\n\
-            content-length: 123\r\n\
+            content-length: 125\r\n\
             accept-encoding: gzip\r\n\
             host: $HOST\r\n\
             \r\n\