diff options
| author | Patrick Monnerat <patrick@monnerat.net> | 2020-01-21 01:33:04 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-03-02 00:00:50 +0100 |
| commit | 87869e38d7afdec3ef1bb4965711458b088e254f (patch) | |
| tree | 7da06feb40bf6ee89024a52f7f6a54fb33d44e8c /lib/mime.h | |
| parent | cf1466bd473e06812dce0c3880f7e4af169e9e72 (diff) | |
| download | curl-87869e38d7afdec3ef1bb4965711458b088e254f.tar.gz | |
mime: latch last read callback status.
In case a read callback returns a status (pause, abort, eof,
error) instead of a byte count, drain the bytes read so far but
remember this status for further processing.
Takes care of not losing data when pausing, and properly resume a
paused mime structure when requested.
New tests 670-673 check unpausing cases, with easy or multi
interface and mime or form api.
Fixes #4813
Reported-by: MrdUkk on github
Closes #4833
Diffstat (limited to 'lib/mime.h')
| -rw-r--r-- | lib/mime.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/mime.h b/lib/mime.h index 3241fdc1f..c6d374ec1 100644 --- a/lib/mime.h +++ b/lib/mime.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -125,6 +125,7 @@ struct curl_mimepart_s { mime_state state; /* Current readback state. */ const mime_encoder *encoder; /* Content data encoder. */ mime_encoder_state encstate; /* Data encoder state. */ + size_t lastreadstatus; /* Last read callback returned status. */ }; CURLcode Curl_mime_add_header(struct curl_slist **slp, const char *fmt, ...); @@ -147,6 +148,7 @@ size_t Curl_mime_read(char *buffer, size_t size, size_t nitems, void *instream); CURLcode Curl_mime_rewind(curl_mimepart *part); const char *Curl_mime_contenttype(const char *filename); +void Curl_mime_unpause(curl_mimepart *part); #else /* if disabled */ @@ -158,6 +160,7 @@ const char *Curl_mime_contenttype(const char *filename); #define Curl_mime_size(x) (curl_off_t) -1 #define Curl_mime_read NULL #define Curl_mime_rewind(x) ((void)x, CURLE_NOT_BUILT_IN) +#define Curl_mime_unpause(x) #endif |