diff --git a/test/test-cases/regression/action-ctl_request_body_access.json b/test/test-cases/regression/action-ctl_request_body_access.json
index e09a732fd..2189d3481 100644
--- a/test/test-cases/regression/action-ctl_request_body_access.json
+++ b/test/test-cases/regression/action-ctl_request_body_access.json
@@ -16,28 +16,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/test",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -79,28 +79,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/test",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -142,28 +142,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/test",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/config-body_limits.json b/test/test-cases/regression/config-body_limits.json
index e45dfce22..c7a08c353 100644
--- a/test/test-cases/regression/config-body_limits.json
+++ b/test/test-cases/regression/config-body_limits.json
@@ -107,26 +107,26 @@
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
-        "Content-Length": "493"
+        "Content-Length": "523"
       },
       "uri": "/?key=value&key=other_value",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -167,26 +167,26 @@
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
-        "Content-Length": "493"
+        "Content-Length": "523"
       },
       "uri": "/?key=value&key=other_value",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -227,26 +227,26 @@
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
-        "Content-Length": "493"
+        "Content-Length": "523"
       },
       "uri": "/?key=value&key=other_value",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -286,26 +286,26 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
-        "Content-Length": "493"
+        "Content-Length": "523"
       },
       "uri": "/?key=value&key=other_value",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/issue-2427.json b/test/test-cases/regression/issue-2427.json
index f6bccc65b..53aae01f5 100644
--- a/test/test-cases/regression/issue-2427.json
+++ b/test/test-cases/regression/issue-2427.json
@@ -85,32 +85,32 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "639",
+        "Content-Length": "677",
         "Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/wheee/f%20i%20l%20e%20",
       "method": "POST",
       "body": [
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name2\"",
-        "",
-        "test2",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"small2.txt\" ",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file that does not contain the search content.",
-        "----------------------------756b6d74fa1a8ee2--"
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name2\"\r\n",
+        "\r\n",
+        "test2\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"small2.txt\" \r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file that does not contain the search content.\r\n",
+        "----------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/offset-variable.json b/test/test-cases/regression/offset-variable.json
index 6ee6d61ad..a6113b438 100644
--- a/test/test-cases/regression/offset-variable.json
+++ b/test/test-cases/regression/offset-variable.json
@@ -1508,28 +1508,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "501",
+        "Content-Length": "531",
         "Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/wheee/file?something else",
       "method": "POST",
       "body": [
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "----------------------------756b6d74fa1a8ee2--"
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -1566,28 +1566,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "501",
+        "Content-Length": "531",
         "Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/wheee/f%20i%20l%20e%20?something else",
       "method": "POST",
       "body": [
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "----------------------------756b6d74fa1a8ee2--"
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -1624,28 +1624,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "501",
+        "Content-Length": "531",
         "Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/wheee/f%20i%20l%20e%20",
       "method": "POST",
       "body": [
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "----------------------------756b6d74fa1a8ee2--"
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
@@ -2302,32 +2302,32 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "605",
+        "Content-Length": "643",
         "Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/wheee/f%20i%20l%20e%20",
       "method": "POST",
       "body": [
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name2\"",
-        "",
-        "test2",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"fiasdfasdfledata\" ",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "----------------------------756b6d74fa1a8ee2--"
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name2\"\r\n",
+        "\r\n",
+        "test2\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"fiasdfasdfledata\" \r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-FULL_REQUEST.json b/test/test-cases/regression/variable-FULL_REQUEST.json
index 260565de5..1700f5840 100644
--- a/test/test-cases/regression/variable-FULL_REQUEST.json
+++ b/test/test-cases/regression/variable-FULL_REQUEST.json
@@ -16,28 +16,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json b/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json
index fd97ac80a..7ce5bc36f 100644
--- a/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json
+++ b/test/test-cases/regression/variable-INBOUND_DATA_ERROR.json
@@ -61,28 +61,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json
index 77d58292d..a8bf4ad45 100644
--- a/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json
+++ b/test/test-cases/regression/variable-MULTIPART_PART_HEADERS.json
@@ -128,23 +128,23 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "292",
+        "Content-Length": "312",
         "Content-Type": "multipart/form-data; boundary=-----------------------------69343412719991675451336310646",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "-------------------------------69343412719991675451336310646",
-        "Content-Disposition: form-data; name=parm1",
-        "Content-Type: image/jpeg",
-        "",
-        "1",
-        "-------------------------------69343412719991675451336310646",
-        "Content-Disposition: form-data; name=parm2",
-        "",
-        "2",
-        "-------------------------------69343412719991675451336310646--"
+        "-------------------------------69343412719991675451336310646\r\n",
+        "Content-Disposition: form-data; name=parm1\r\n",
+        "Content-Type: image/jpeg\r\n",
+        "\r\n",
+        "1\r\n",
+        "-------------------------------69343412719991675451336310646\r\n",
+        "Content-Disposition: form-data; name=parm2\r\n",
+        "\r\n",
+        "2\r\n",
+        "-------------------------------69343412719991675451336310646--\r\n"
       ]
     },
     "response": {
@@ -183,19 +183,19 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "241",
+        "Content-Length": "251",
         "Content-Type": "multipart/form-data; boundary=-----------------------------69343412719991675451336310646",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "-------------------------------69343412719991675451336310646",
-        "Content-Disposition: form-data; name=\"file\"; filename=\"New Text Document.txt\"",
+        "-------------------------------69343412719991675451336310646\r\n",
+        "Content-Disposition: form-data; name=\"file\"; filename=\"New Text Document.txt\"\r\n",
         "Content-Type: text/plain; charset=utf-8\r\n",
-        "",
-        "1",
-        "-------------------------------69343412719991675451336310646--"
+        "\r\n",
+        "1\r\n",
+        "-------------------------------69343412719991675451336310646--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json b/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json
index 00047d81c..b74b64473 100644
--- a/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json
+++ b/test/test-cases/regression/variable-MULTIPART_STRICT_ERROR.json
@@ -433,28 +433,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "502",
+        "Content-Length": "532",
         "Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"file'data\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "----------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "----------------------------756b6d74fa1a8ee2--"
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"file'data\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "----------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json b/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json
index 8053f8294..b82c905c7 100644
--- a/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json
+++ b/test/test-cases/regression/variable-OUTBOUND_DATA_ERROR.json
@@ -62,28 +62,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-REQBODY_PROCESSOR.json b/test/test-cases/regression/variable-REQBODY_PROCESSOR.json
index 92a278e51..9948ebb80 100644
--- a/test/test-cases/regression/variable-REQBODY_PROCESSOR.json
+++ b/test/test-cases/regression/variable-REQBODY_PROCESSOR.json
@@ -95,27 +95,27 @@
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
-        "Content-Length": "493"
+        "Content-Length": "523"
       },
       "uri": "/?key=value&key=other_value",
       "method": "POST",
       "http_version": 1.1,
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-REQUEST_HEADERS.json b/test/test-cases/regression/variable-REQUEST_HEADERS.json
index 9c603e759..473ea23b0 100644
--- a/test/test-cases/regression/variable-REQUEST_HEADERS.json
+++ b/test/test-cases/regression/variable-REQUEST_HEADERS.json
@@ -16,28 +16,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json b/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json
index 45319c15b..dc968b65d 100644
--- a/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json
+++ b/test/test-cases/regression/variable-REQUEST_HEADERS_NAMES.json
@@ -16,28 +16,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-RESPONSE_HEADERS.json b/test/test-cases/regression/variable-RESPONSE_HEADERS.json
index eeebe3952..4ca9208cb 100644
--- a/test/test-cases/regression/variable-RESPONSE_HEADERS.json
+++ b/test/test-cases/regression/variable-RESPONSE_HEADERS.json
@@ -16,28 +16,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {
diff --git a/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json b/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json
index eda71bb1a..40fce8d10 100644
--- a/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json
+++ b/test/test-cases/regression/variable-RESPONSE_HEADERS_NAMES.json
@@ -16,28 +16,28 @@
         "Host": "localhost",
         "User-Agent": "curl/7.38.0",
         "Accept": "*/*",
-        "Content-Length": "493",
+        "Content-Length": "523",
         "Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
         "Expect": "100-continue"
       },
       "uri": "/",
       "method": "POST",
       "body": [
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"name\"",
-        "",
-        "test",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is a very small test file..",
-        "--------------------------756b6d74fa1a8ee2",
-        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
-        "Content-Type: text/plain",
-        "",
-        "This is another very small test file..",
-        "--------------------------756b6d74fa1a8ee2--"
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"name\"\r\n",
+        "\r\n",
+        "test\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is a very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2\r\n",
+        "Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
+        "Content-Type: text/plain\r\n",
+        "\r\n",
+        "This is another very small test file..\r\n",
+        "--------------------------756b6d74fa1a8ee2--\r\n"
       ]
     },
     "response": {