Skip to content

Commit b4f23d0

Browse files
airweenairween
authored
Merge pull request #3497 from hnakamur/add_crlf_to_multipart_test_cases
Add missing CRLF to regression test request bodies
2 parents 5ed6c9e + 00d16a6 commit b4f23d0

14 files changed

+361
-361
lines changed

‎test/test-cases/regression/action-ctl_request_body_access.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@
1616
"Host": "localhost",
1717
"User-Agent": "curl/7.38.0",
1818
"Accept": "*/*",
19-
"Content-Length": "493",
19+
"Content-Length": "523",
2020
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
2121
"Expect": "100-continue"
2222
},
2323
"uri": "/test",
2424
"method": "POST",
2525
"body": [
26-
"--------------------------756b6d74fa1a8ee2",
27-
"Content-Disposition: form-data; name=\"name\"",
28-
"",
29-
"test",
30-
"--------------------------756b6d74fa1a8ee2",
31-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
32-
"Content-Type: text/plain",
33-
"",
34-
"This is a very small test file..",
35-
"--------------------------756b6d74fa1a8ee2",
36-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
37-
"Content-Type: text/plain",
38-
"",
39-
"This is another very small test file..",
40-
"--------------------------756b6d74fa1a8ee2--"
26+
"--------------------------756b6d74fa1a8ee2\r\n",
27+
"Content-Disposition: form-data; name=\"name\"\r\n",
28+
"\r\n",
29+
"test\r\n",
30+
"--------------------------756b6d74fa1a8ee2\r\n",
31+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
32+
"Content-Type: text/plain\r\n",
33+
"\r\n",
34+
"This is a very small test file..\r\n",
35+
"--------------------------756b6d74fa1a8ee2\r\n",
36+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
37+
"Content-Type: text/plain\r\n",
38+
"\r\n",
39+
"This is another very small test file..\r\n",
40+
"--------------------------756b6d74fa1a8ee2--\r\n"
4141
]
4242
},
4343
"response": {
@@ -79,28 +79,28 @@
7979
"Host": "localhost",
8080
"User-Agent": "curl/7.38.0",
8181
"Accept": "*/*",
82-
"Content-Length": "493",
82+
"Content-Length": "523",
8383
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
8484
"Expect": "100-continue"
8585
},
8686
"uri": "/test",
8787
"method": "POST",
8888
"body": [
89-
"--------------------------756b6d74fa1a8ee2",
90-
"Content-Disposition: form-data; name=\"name\"",
91-
"",
92-
"test",
93-
"--------------------------756b6d74fa1a8ee2",
94-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
95-
"Content-Type: text/plain",
96-
"",
97-
"This is a very small test file..",
98-
"--------------------------756b6d74fa1a8ee2",
99-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
100-
"Content-Type: text/plain",
101-
"",
102-
"This is another very small test file..",
103-
"--------------------------756b6d74fa1a8ee2--"
89+
"--------------------------756b6d74fa1a8ee2\r\n",
90+
"Content-Disposition: form-data; name=\"name\"\r\n",
91+
"\r\n",
92+
"test\r\n",
93+
"--------------------------756b6d74fa1a8ee2\r\n",
94+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
95+
"Content-Type: text/plain\r\n",
96+
"\r\n",
97+
"This is a very small test file..\r\n",
98+
"--------------------------756b6d74fa1a8ee2\r\n",
99+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
100+
"Content-Type: text/plain\r\n",
101+
"\r\n",
102+
"This is another very small test file..\r\n",
103+
"--------------------------756b6d74fa1a8ee2--\r\n"
104104
]
105105
},
106106
"response": {
@@ -142,28 +142,28 @@
142142
"Host": "localhost",
143143
"User-Agent": "curl/7.38.0",
144144
"Accept": "*/*",
145-
"Content-Length": "493",
145+
"Content-Length": "523",
146146
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
147147
"Expect": "100-continue"
148148
},
149149
"uri": "/test",
150150
"method": "POST",
151151
"body": [
152-
"--------------------------756b6d74fa1a8ee2",
153-
"Content-Disposition: form-data; name=\"name\"",
154-
"",
155-
"test",
156-
"--------------------------756b6d74fa1a8ee2",
157-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
158-
"Content-Type: text/plain",
159-
"",
160-
"This is a very small test file..",
161-
"--------------------------756b6d74fa1a8ee2",
162-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
163-
"Content-Type: text/plain",
164-
"",
165-
"This is another very small test file..",
166-
"--------------------------756b6d74fa1a8ee2--"
152+
"--------------------------756b6d74fa1a8ee2\r\n",
153+
"Content-Disposition: form-data; name=\"name\"\r\n",
154+
"\r\n",
155+
"test\r\n",
156+
"--------------------------756b6d74fa1a8ee2\r\n",
157+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
158+
"Content-Type: text/plain\r\n",
159+
"\r\n",
160+
"This is a very small test file..\r\n",
161+
"--------------------------756b6d74fa1a8ee2\r\n",
162+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
163+
"Content-Type: text/plain\r\n",
164+
"\r\n",
165+
"This is another very small test file..\r\n",
166+
"--------------------------756b6d74fa1a8ee2--\r\n"
167167
]
168168
},
169169
"response": {

‎test/test-cases/regression/config-body_limits.json‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,26 @@
107107
"User-Agent": "curl/7.38.0",
108108
"Accept": "*/*",
109109
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
110-
"Content-Length": "493"
110+
"Content-Length": "523"
111111
},
112112
"uri": "/?key=value&key=other_value",
113113
"method": "POST",
114114
"body": [
115-
"--------------------------756b6d74fa1a8ee2",
116-
"Content-Disposition: form-data; name=\"name\"",
117-
"",
118-
"test",
119-
"--------------------------756b6d74fa1a8ee2",
120-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
121-
"Content-Type: text/plain",
122-
"",
123-
"This is a very small test file..",
124-
"--------------------------756b6d74fa1a8ee2",
125-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
126-
"Content-Type: text/plain",
127-
"",
128-
"This is another very small test file..",
129-
"--------------------------756b6d74fa1a8ee2--"
115+
"--------------------------756b6d74fa1a8ee2\r\n",
116+
"Content-Disposition: form-data; name=\"name\"\r\n",
117+
"\r\n",
118+
"test\r\n",
119+
"--------------------------756b6d74fa1a8ee2\r\n",
120+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
121+
"Content-Type: text/plain\r\n",
122+
"\r\n",
123+
"This is a very small test file..\r\n",
124+
"--------------------------756b6d74fa1a8ee2\r\n",
125+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
126+
"Content-Type: text/plain\r\n",
127+
"\r\n",
128+
"This is another very small test file..\r\n",
129+
"--------------------------756b6d74fa1a8ee2--\r\n"
130130
]
131131
},
132132
"response": {
@@ -167,26 +167,26 @@
167167
"User-Agent": "curl/7.38.0",
168168
"Accept": "*/*",
169169
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
170-
"Content-Length": "493"
170+
"Content-Length": "523"
171171
},
172172
"uri": "/?key=value&key=other_value",
173173
"method": "POST",
174174
"body": [
175-
"--------------------------756b6d74fa1a8ee2",
176-
"Content-Disposition: form-data; name=\"name\"",
177-
"",
178-
"test",
179-
"--------------------------756b6d74fa1a8ee2",
180-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
181-
"Content-Type: text/plain",
182-
"",
183-
"This is a very small test file..",
184-
"--------------------------756b6d74fa1a8ee2",
185-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
186-
"Content-Type: text/plain",
187-
"",
188-
"This is another very small test file..",
189-
"--------------------------756b6d74fa1a8ee2--"
175+
"--------------------------756b6d74fa1a8ee2\r\n",
176+
"Content-Disposition: form-data; name=\"name\"\r\n",
177+
"\r\n",
178+
"test\r\n",
179+
"--------------------------756b6d74fa1a8ee2\r\n",
180+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
181+
"Content-Type: text/plain\r\n",
182+
"\r\n",
183+
"This is a very small test file..\r\n",
184+
"--------------------------756b6d74fa1a8ee2\r\n",
185+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
186+
"Content-Type: text/plain\r\n",
187+
"\r\n",
188+
"This is another very small test file..\r\n",
189+
"--------------------------756b6d74fa1a8ee2--\r\n"
190190
]
191191
},
192192
"response": {
@@ -227,26 +227,26 @@
227227
"User-Agent": "curl/7.38.0",
228228
"Accept": "*/*",
229229
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
230-
"Content-Length": "493"
230+
"Content-Length": "523"
231231
},
232232
"uri": "/?key=value&key=other_value",
233233
"method": "POST",
234234
"body": [
235-
"--------------------------756b6d74fa1a8ee2",
236-
"Content-Disposition: form-data; name=\"name\"",
237-
"",
238-
"test",
239-
"--------------------------756b6d74fa1a8ee2",
240-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
241-
"Content-Type: text/plain",
242-
"",
243-
"This is a very small test file..",
244-
"--------------------------756b6d74fa1a8ee2",
245-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
246-
"Content-Type: text/plain",
247-
"",
248-
"This is another very small test file..",
249-
"--------------------------756b6d74fa1a8ee2--"
235+
"--------------------------756b6d74fa1a8ee2\r\n",
236+
"Content-Disposition: form-data; name=\"name\"\r\n",
237+
"\r\n",
238+
"test\r\n",
239+
"--------------------------756b6d74fa1a8ee2\r\n",
240+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
241+
"Content-Type: text/plain\r\n",
242+
"\r\n",
243+
"This is a very small test file..\r\n",
244+
"--------------------------756b6d74fa1a8ee2\r\n",
245+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
246+
"Content-Type: text/plain\r\n",
247+
"\r\n",
248+
"This is another very small test file..\r\n",
249+
"--------------------------756b6d74fa1a8ee2--\r\n"
250250
]
251251
},
252252
"response": {
@@ -286,26 +286,26 @@
286286
"Host": "localhost",
287287
"User-Agent": "curl/7.38.0",
288288
"Content-Type": "multipart/form-data; boundary=------------------------756b6d74fa1a8ee2",
289-
"Content-Length": "493"
289+
"Content-Length": "523"
290290
},
291291
"uri": "/?key=value&key=other_value",
292292
"method": "POST",
293293
"body": [
294-
"--------------------------756b6d74fa1a8ee2",
295-
"Content-Disposition: form-data; name=\"name\"",
296-
"",
297-
"test",
298-
"--------------------------756b6d74fa1a8ee2",
299-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
300-
"Content-Type: text/plain",
301-
"",
302-
"This is a very small test file..",
303-
"--------------------------756b6d74fa1a8ee2",
304-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
305-
"Content-Type: text/plain",
306-
"",
307-
"This is another very small test file..",
308-
"--------------------------756b6d74fa1a8ee2--"
294+
"--------------------------756b6d74fa1a8ee2\r\n",
295+
"Content-Disposition: form-data; name=\"name\"\r\n",
296+
"\r\n",
297+
"test\r\n",
298+
"--------------------------756b6d74fa1a8ee2\r\n",
299+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
300+
"Content-Type: text/plain\r\n",
301+
"\r\n",
302+
"This is a very small test file..\r\n",
303+
"--------------------------756b6d74fa1a8ee2\r\n",
304+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"\r\n",
305+
"Content-Type: text/plain\r\n",
306+
"\r\n",
307+
"This is another very small test file..\r\n",
308+
"--------------------------756b6d74fa1a8ee2--\r\n"
309309
]
310310
},
311311
"response": {

‎test/test-cases/regression/issue-2427.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,32 +85,32 @@
8585
"Host": "localhost",
8686
"User-Agent": "curl/7.38.0",
8787
"Accept": "*/*",
88-
"Content-Length": "639",
88+
"Content-Length": "677",
8989
"Content-Type": "multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
9090
"Expect": "100-continue"
9191
},
9292
"uri": "/wheee/f%20i%20l%20e%20",
9393
"method": "POST",
9494
"body": [
95-
"----------------------------756b6d74fa1a8ee2",
96-
"Content-Disposition: form-data; name=\"name\"",
97-
"",
98-
"test",
99-
"----------------------------756b6d74fa1a8ee2",
100-
"Content-Disposition: form-data; name=\"name2\"",
101-
"",
102-
"test2",
103-
"----------------------------756b6d74fa1a8ee2",
104-
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"",
105-
"Content-Type: text/plain",
106-
"",
107-
"This is a very small test file..",
108-
"----------------------------756b6d74fa1a8ee2",
109-
"Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"small2.txt\" ",
110-
"Content-Type: text/plain",
111-
"",
112-
"This is another very small test file that does not contain the search content.",
113-
"----------------------------756b6d74fa1a8ee2--"
95+
"----------------------------756b6d74fa1a8ee2\r\n",
96+
"Content-Disposition: form-data; name=\"name\"\r\n",
97+
"\r\n",
98+
"test\r\n",
99+
"----------------------------756b6d74fa1a8ee2\r\n",
100+
"Content-Disposition: form-data; name=\"name2\"\r\n",
101+
"\r\n",
102+
"test2\r\n",
103+
"----------------------------756b6d74fa1a8ee2\r\n",
104+
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file1.txt\"\r\n",
105+
"Content-Type: text/plain\r\n",
106+
"\r\n",
107+
"This is a very small test file..\r\n",
108+
"----------------------------756b6d74fa1a8ee2\r\n",
109+
"Content-Disposition: form-data; filename=\"small_text_file2.txt\"; name=\"small2.txt\" \r\n",
110+
"Content-Type: text/plain\r\n",
111+
"\r\n",
112+
"This is another very small test file that does not contain the search content.\r\n",
113+
"----------------------------756b6d74fa1a8ee2--\r\n"
114114
]
115115
},
116116
"response": {

0 commit comments

Comments
 (0)