multipart: Force a CRLF at the end of request

seanmonstar · Jul 31, 2018 · 7fd6bb3 · 7fd6bb3
1 parent a4f5c2d
commit 7fd6bb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/multipart_.rs b/src/multipart_.rs
@@ -109,7 +109,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)
     }
@@ -272,7 +272,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 {
@@ -378,7 +378,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!(
@@ -414,7 +414,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
@@ -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! {
@@ -25,7 +25,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\
             \r\n\
             {}\