fix(tests): update of form-data introduces a line break at the end of the final boundary

ahmadnassri · ahmadnassri · commit 8ec13fc7c127 · 2015-08-03T18:05:01.000-04:00
diff --git a/test/fixtures/output/c/libcurl/multipart-data.c b/test/fixtures/output/c/libcurl/multipart-data.c
@@ -7,6 +7,6 @@ struct curl_slist *headers = NULL;
 headers = curl_slist_append(headers, "content-type: multipart/form-data; boundary=---011000010111000001101001");
 curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers);
 
-curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--");
+curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n");
 
 CURLcode ret = curl_easy_perform(hnd);
diff --git a/test/fixtures/output/c/libcurl/multipart-file.c b/test/fixtures/output/c/libcurl/multipart-file.c
@@ -7,6 +7,6 @@ struct curl_slist *headers = NULL;
 headers = curl_slist_append(headers, "content-type: multipart/form-data; boundary=---011000010111000001101001");
 curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers);
 
-curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--");
+curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n");
 
 CURLcode ret = curl_easy_perform(hnd);
diff --git a/test/fixtures/output/c/libcurl/multipart-form-data.c b/test/fixtures/output/c/libcurl/multipart-form-data.c
@@ -7,6 +7,6 @@ struct curl_slist *headers = NULL;
 headers = curl_slist_append(headers, "content-type: multipart/form-data; boundary=---011000010111000001101001");
 curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, headers);
 
-curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--");
+curl_easy_setopt(hnd, CURLOPT_POSTFIELDS, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n");
 
 CURLcode ret = curl_easy_perform(hnd);
diff --git a/test/fixtures/output/csharp/restsharp/multipart-data.cs b/test/fixtures/output/csharp/restsharp/multipart-data.cs
@@ -1,5 +1,5 @@
 var client = new RestClient("http://mockbin.com/har");
 var request = new RestRequest(Method.POST);
 request.AddHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001");
-request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--", ParameterType.RequestBody);
+request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody);
 IRestResponse response = client.Execute(request);
diff --git a/test/fixtures/output/csharp/restsharp/multipart-file.cs b/test/fixtures/output/csharp/restsharp/multipart-file.cs
@@ -1,5 +1,5 @@
 var client = new RestClient("http://mockbin.com/har");
 var request = new RestRequest(Method.POST);
 request.AddHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001");
-request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--", ParameterType.RequestBody);
+request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody);
 IRestResponse response = client.Execute(request);
diff --git a/test/fixtures/output/csharp/restsharp/multipart-form-data.cs b/test/fixtures/output/csharp/restsharp/multipart-form-data.cs
@@ -1,5 +1,5 @@
 var client = new RestClient("http://mockbin.com/har");
 var request = new RestRequest(Method.POST);
 request.AddHeader("content-type", "multipart/form-data; boundary=---011000010111000001101001");
-request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--", ParameterType.RequestBody);
+request.AddParameter("multipart/form-data; boundary=---011000010111000001101001", "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n", ParameterType.RequestBody);
 IRestResponse response = client.Execute(request);
diff --git a/test/fixtures/output/go/native/multipart-data.go b/test/fixtures/output/go/native/multipart-data.go
@@ -11,7 +11,7 @@ func main() {
 
 	url := "http://mockbin.com/har"
 
-	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--")
+	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n")
 
 	req, _ := http.NewRequest("POST", url, payload)
 
diff --git a/test/fixtures/output/go/native/multipart-file.go b/test/fixtures/output/go/native/multipart-file.go
@@ -11,7 +11,7 @@ func main() {
 
 	url := "http://mockbin.com/har"
 
-	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--")
+	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n")
 
 	req, _ := http.NewRequest("POST", url, payload)
 
diff --git a/test/fixtures/output/go/native/multipart-form-data.go b/test/fixtures/output/go/native/multipart-form-data.go
@@ -11,7 +11,7 @@ func main() {
 
 	url := "http://mockbin.com/har"
 
-	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--")
+	payload := strings.NewReader("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n")
 
 	req, _ := http.NewRequest("POST", url, payload)
 
diff --git a/test/fixtures/output/java/okhttp/multipart-data.java b/test/fixtures/output/java/okhttp/multipart-data.java
@@ -1,7 +1,7 @@
 OkHttpClient client = new OkHttpClient();
 
 MediaType mediaType = MediaType.parse("multipart/form-data; boundary=---011000010111000001101001");
-RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--");
+RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n");
 Request request = new Request.Builder()
   .url("http://mockbin.com/har")
   .post(body)
diff --git a/test/fixtures/output/java/okhttp/multipart-file.java b/test/fixtures/output/java/okhttp/multipart-file.java
@@ -1,7 +1,7 @@
 OkHttpClient client = new OkHttpClient();
 
 MediaType mediaType = MediaType.parse("multipart/form-data; boundary=---011000010111000001101001");
-RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--");
+RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n");
 Request request = new Request.Builder()
   .url("http://mockbin.com/har")
   .post(body)
diff --git a/test/fixtures/output/java/okhttp/multipart-form-data.java b/test/fixtures/output/java/okhttp/multipart-form-data.java
@@ -1,7 +1,7 @@
 OkHttpClient client = new OkHttpClient();
 
 MediaType mediaType = MediaType.parse("multipart/form-data; boundary=---011000010111000001101001");
-RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--");
+RequestBody body = RequestBody.create(mediaType, "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n");
 Request request = new Request.Builder()
   .url("http://mockbin.com/har")
   .post(body)
diff --git a/test/fixtures/output/java/unirest/multipart-data.java b/test/fixtures/output/java/unirest/multipart-data.java
@@ -1,4 +1,4 @@
 HttpResponse<String> response = Unirest.post("http://mockbin.com/har")
   .header("content-type", "multipart/form-data; boundary=---011000010111000001101001")
-  .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--")
+  .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n")
   .asString();
diff --git a/test/fixtures/output/java/unirest/multipart-file.java b/test/fixtures/output/java/unirest/multipart-file.java
@@ -1,4 +1,4 @@
 HttpResponse<String> response = Unirest.post("http://mockbin.com/har")
   .header("content-type", "multipart/form-data; boundary=---011000010111000001101001")
-  .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--")
+  .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n")
   .asString();
diff --git a/test/fixtures/output/java/unirest/multipart-form-data.java b/test/fixtures/output/java/unirest/multipart-form-data.java
@@ -1,4 +1,4 @@
 HttpResponse<String> response = Unirest.post("http://mockbin.com/har")
   .header("content-type", "multipart/form-data; boundary=---011000010111000001101001")
-  .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--")
+  .body("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n")
   .asString();
diff --git a/test/fixtures/output/node/native/multipart-data.js b/test/fixtures/output/node/native/multipart-data.js
@@ -23,5 +23,5 @@ var req = http.request(options, function (res) {
   });
 });
 
-req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--");
+req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n");
 req.end();
diff --git a/test/fixtures/output/node/native/multipart-file.js b/test/fixtures/output/node/native/multipart-file.js
@@ -23,5 +23,5 @@ var req = http.request(options, function (res) {
   });
 });
 
-req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--");
+req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n");
 req.end();
diff --git a/test/fixtures/output/node/native/multipart-form-data.js b/test/fixtures/output/node/native/multipart-form-data.js
@@ -23,5 +23,5 @@ var req = http.request(options, function (res) {
   });
 });
 
-req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--");
+req.write("-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n");
 req.end();
diff --git a/test/fixtures/output/ocaml/cohttp/multipart-data.ml b/test/fixtures/output/ocaml/cohttp/multipart-data.ml
@@ -4,7 +4,7 @@ open Lwt
 
 let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.add (Header.init ()) "content-type" "multipart/form-data; boundary=---011000010111000001101001" in
-let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--" in
+let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/multipart-file.ml b/test/fixtures/output/ocaml/cohttp/multipart-file.ml
@@ -4,7 +4,7 @@ open Lwt
 
 let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.add (Header.init ()) "content-type" "multipart/form-data; boundary=---011000010111000001101001" in
-let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--" in
+let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/ocaml/cohttp/multipart-form-data.ml b/test/fixtures/output/ocaml/cohttp/multipart-form-data.ml
@@ -4,7 +4,7 @@ open Lwt
 
 let uri = Uri.of_string "http://mockbin.com/har" in
 let headers = Header.add (Header.init ()) "content-type" "multipart/form-data; boundary=---011000010111000001101001" in
-let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--" in
+let body = Cohttp_lwt_body.of_string "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n" in
 
 Client.call ~headers ~body `POST uri
 >>= fun (res, body_stream) ->
diff --git a/test/fixtures/output/php/curl/multipart-data.php b/test/fixtures/output/php/curl/multipart-data.php
@@ -10,7 +10,7 @@
   CURLOPT_TIMEOUT => 30,
   CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
   CURLOPT_CUSTOMREQUEST => "POST",
-  CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--",
+  CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n",
   CURLOPT_HTTPHEADER => array(
     "content-type: multipart/form-data; boundary=---011000010111000001101001"
   ),
diff --git a/test/fixtures/output/php/curl/multipart-file.php b/test/fixtures/output/php/curl/multipart-file.php
@@ -10,7 +10,7 @@
   CURLOPT_TIMEOUT => 30,
   CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
   CURLOPT_CUSTOMREQUEST => "POST",
-  CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--",
+  CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n",
   CURLOPT_HTTPHEADER => array(
     "content-type: multipart/form-data; boundary=---011000010111000001101001"
   ),
diff --git a/test/fixtures/output/php/curl/multipart-form-data.php b/test/fixtures/output/php/curl/multipart-form-data.php
@@ -10,7 +10,7 @@
   CURLOPT_TIMEOUT => 30,
   CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
   CURLOPT_CUSTOMREQUEST => "POST",
-  CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--",
+  CURLOPT_POSTFIELDS => "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n",
   CURLOPT_HTTPHEADER => array(
     "content-type: multipart/form-data; boundary=---011000010111000001101001"
   ),
diff --git a/test/fixtures/output/php/http1/multipart-data.php b/test/fixtures/output/php/http1/multipart-data.php
@@ -13,7 +13,8 @@
 Content-Type: text/plain
 
 Hello World
------011000010111000001101001--');
+-----011000010111000001101001--
+');
 
 try {
   $response = $request->send();
diff --git a/test/fixtures/output/php/http1/multipart-file.php b/test/fixtures/output/php/http1/multipart-file.php
@@ -13,7 +13,8 @@
 Content-Type: text/plain
 
 
------011000010111000001101001--');
+-----011000010111000001101001--
+');
 
 try {
   $response = $request->send();
diff --git a/test/fixtures/output/php/http1/multipart-form-data.php b/test/fixtures/output/php/http1/multipart-form-data.php
@@ -12,7 +12,8 @@
 Content-Disposition: form-data; name="foo"
 
 bar
------011000010111000001101001--');
+-----011000010111000001101001--
+');
 
 try {
   $response = $request->send();
diff --git a/test/fixtures/output/python/python3/multipart-data.py b/test/fixtures/output/python/python3/multipart-data.py
@@ -2,7 +2,7 @@
 
 conn = http.client.HTTPConnection("mockbin.com")
 
-payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--"
+payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"
 
 headers = { 'content-type': "multipart/form-data; boundary=---011000010111000001101001" }
 
diff --git a/test/fixtures/output/python/python3/multipart-file.py b/test/fixtures/output/python/python3/multipart-file.py
@@ -2,7 +2,7 @@
 
 conn = http.client.HTTPConnection("mockbin.com")
 
-payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--"
+payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"
 
 headers = { 'content-type': "multipart/form-data; boundary=---011000010111000001101001" }
 
diff --git a/test/fixtures/output/python/python3/multipart-form-data.py b/test/fixtures/output/python/python3/multipart-form-data.py
@@ -2,7 +2,7 @@
 
 conn = http.client.HTTPConnection("mockbin.com")
 
-payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--"
+payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"
 
 headers = { 'content-type': "multipart/form-data; boundary=---011000010111000001101001" }
 
diff --git a/test/fixtures/output/python/requests/multipart-data.py b/test/fixtures/output/python/requests/multipart-data.py
@@ -2,7 +2,7 @@
 
 url = "http://mockbin.com/har"
 
-payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--"
+payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"
 headers = {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}
 
 response = requests.request("POST", url, data=payload, headers=headers)
diff --git a/test/fixtures/output/python/requests/multipart-file.py b/test/fixtures/output/python/requests/multipart-file.py
@@ -2,7 +2,7 @@
 
 url = "http://mockbin.com/har"
 
-payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--"
+payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"
 headers = {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}
 
 response = requests.request("POST", url, data=payload, headers=headers)
diff --git a/test/fixtures/output/python/requests/multipart-form-data.py b/test/fixtures/output/python/requests/multipart-form-data.py
@@ -2,7 +2,7 @@
 
 url = "http://mockbin.com/har"
 
-payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--"
+payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"
 headers = {'content-type': 'multipart/form-data; boundary=---011000010111000001101001'}
 
 response = requests.request("POST", url, data=payload, headers=headers)
diff --git a/test/fixtures/output/ruby/native/multipart-data.rb b/test/fixtures/output/ruby/native/multipart-data.rb
@@ -7,7 +7,7 @@
 
 request = Net::HTTP::Post.new(url)
 request["content-type"] = 'multipart/form-data; boundary=---011000010111000001101001'
-request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--"
+request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"
 
 response = http.request(request)
 puts response.read_body
diff --git a/test/fixtures/output/ruby/native/multipart-file.rb b/test/fixtures/output/ruby/native/multipart-file.rb
@@ -7,7 +7,7 @@
 
 request = Net::HTTP::Post.new(url)
 request["content-type"] = 'multipart/form-data; boundary=---011000010111000001101001'
-request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--"
+request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"
 
 response = http.request(request)
 puts response.read_body
diff --git a/test/fixtures/output/ruby/native/multipart-form-data.rb b/test/fixtures/output/ruby/native/multipart-form-data.rb
@@ -7,7 +7,7 @@
 
 request = Net::HTTP::Post.new(url)
 request["content-type"] = 'multipart/form-data; boundary=---011000010111000001101001'
-request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--"
+request.body = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"
 
 response = http.request(request)
 puts response.read_body
diff --git a/test/fixtures/output/shell/httpie/multipart-data.sh b/test/fixtures/output/shell/httpie/multipart-data.sh
diff --git a/test/fixtures/output/shell/httpie/multipart-file.sh b/test/fixtures/output/shell/httpie/multipart-file.sh
diff --git a/test/fixtures/output/shell/httpie/multipart-form-data.sh b/test/fixtures/output/shell/httpie/multipart-form-data.sh
diff --git a/test/fixtures/output/shell/wget/multipart-data.sh b/test/fixtures/output/shell/wget/multipart-data.sh
diff --git a/test/fixtures/output/shell/wget/multipart-file.sh b/test/fixtures/output/shell/wget/multipart-file.sh
diff --git a/test/fixtures/output/shell/wget/multipart-form-data.sh b/test/fixtures/output/shell/wget/multipart-form-data.sh
