Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mime: do not perform more than one read in a row
Input buffer filling may delay the data sending if data reads are slow. To overcome this problem, file and callback data reads do not accumulate in buffer anymore. All other data (memory data and mime framing) are considered as fast and still concatenated in buffer. As this may highly impact performance in terms of data overhead, an early end of part data check is added to spare a read call. When encoding a part's data, an encoder may require more bytes than made available by a single read. In this case, the above rule does not apply and reads are performed until the encoder is able to deliver some data. Tests 643, 644, 645, 650 and 654 have been adapted to the output data changes, with test data size reduced to avoid the boredom of long lists of 1-byte chunks in verification data. New test 664 checks mimepost using single-byte read callback with encoder. New test 665 checks the end of part data early detection. Fixes curl#4826 Reported-by: MrdUkk on github
- Loading branch information
Showing
15 changed files
with
679 additions
and
77 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
<testcase> | ||
<info> | ||
<keywords> | ||
HTTP | ||
HTTP POST | ||
HTTP MIME POST | ||
</keywords> | ||
</info> | ||
|
||
# | ||
# Server-side | ||
<reply> | ||
<data> | ||
HTTP/1.1 200 OK | ||
Date: Thu, 09 Nov 2010 14:49:00 GMT | ||
Server: test-server/fake swsclose | ||
Connection: close | ||
Content-Type: text/html | ||
|
||
hello | ||
</data> | ||
<datacheck> | ||
HTTP/1.1 200 OK | ||
Date: Thu, 09 Nov 2010 14:49:00 GMT | ||
Server: test-server/fake swsclose | ||
Connection: close | ||
Content-Type: text/html | ||
|
||
hello | ||
</datacheck> | ||
</reply> | ||
|
||
# Client-side | ||
<client> | ||
<server> | ||
http | ||
</server> | ||
# tool is what to use instead of 'curl' | ||
<tool> | ||
lib664 | ||
</tool> | ||
|
||
<name> | ||
HTTP chunked mimepost using single-byte read callback with encoder | ||
</name> | ||
<command> | ||
http://%HOSTIP:%HTTPPORT/664 | ||
</command> | ||
</client> | ||
|
||
# | ||
# Verify data after the test has been "shot" | ||
<verify> | ||
<strippart> | ||
s/^--------------------------[a-z0-9]*/------------------------------/ | ||
s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ | ||
</strippart> | ||
# Note that the stripping above removes 12 bytes from every occurrence of the | ||
# boundary string and since 5 of them are in the body contents, we see | ||
# (5*12) == 60 bytes less | ||
<protocol> | ||
POST /664 HTTP/1.1 | ||
Host: %HOSTIP:%HTTPPORT | ||
Accept: */* | ||
Transfer-Encoding: chunked | ||
Content-Type: multipart/form-data; boundary=---------------------------- | ||
Expect: 100-continue | ||
|
||
7f | ||
------------------------------ | ||
Content-Disposition: form-data; name="field" | ||
Content-Transfer-Encoding: base64 | ||
|
||
|
||
4 | ||
ZHVt | ||
34 | ||
bXk= | ||
-------------------------------- | ||
|
||
0 | ||
|
||
</protocol> | ||
</verify> | ||
</testcase> |
Oops, something went wrong.