diff options
author | Patrick Monnerat <patrick@monnerat.net> | 2020-01-29 05:28:26 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2020-03-02 00:00:58 +0100 |
commit | ed0f357f7d25566110d4302f33759f4ffb5a6f83 (patch) | |
tree | 5c2e214eb10e47ebd4e998e372b8563e174fa565 /lib/mime.h | |
parent | 87869e38d7afdec3ef1bb4965711458b088e254f (diff) | |
download | curl-ed0f357f7d25566110d4302f33759f4ffb5a6f83.tar.gz |
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 #4826
Reported-by: MrdUkk on github
Diffstat (limited to 'lib/mime.h')
-rw-r--r-- | lib/mime.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mime.h b/lib/mime.h index c6d374ec1..d7f25132e 100644 --- a/lib/mime.h +++ b/lib/mime.h @@ -31,6 +31,7 @@ /* Part flags. */ #define MIME_USERHEADERS_OWNER (1 << 0) #define MIME_BODY_ONLY (1 << 1) +#define MIME_FAST_READ (1 << 2) #define FILE_CONTENTTYPE_DEFAULT "application/octet-stream" #define MULTIPART_CONTENTTYPE_DEFAULT "multipart/mixed" @@ -87,7 +88,7 @@ typedef struct { typedef struct { enum mimestate state; /* Current state token. */ void *ptr; /* State-dependent pointer. */ - size_t offset; /* State-dependent offset. */ + curl_off_t offset; /* State-dependent offset. */ } mime_state; /* minimum buffer size for the boundary string */ |