diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2018-02-10 15:13:15 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-02-15 09:36:03 +0100 |
| commit | b46cfbc068ebe90f18e9777b9e877e4934c1b5e3 (patch) | |
| tree | 4d88b0f4d9492f51a93251e488400ff7a8abba62 /lib/transfer.c | |
| parent | 43a50a2580db2bfb28483a96964ae27b584472da (diff) | |
| download | curl-b46cfbc068ebe90f18e9777b9e877e4934c1b5e3.tar.gz | |
TODO fixed: Detect when called from within callbacks
Closes #2302
Diffstat (limited to 'lib/transfer.c')
| -rw-r--r-- | lib/transfer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 8f15b1a15..e27792c10 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -135,8 +135,10 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) /* this function returns a size_t, so we typecast to int to prevent warnings with picky compilers */ + Curl_set_in_callback(data, true); nread = (int)data->state.fread_func(data->req.upload_fromhere, 1, buffersize, data->state.in); + Curl_set_in_callback(data, false); if(nread == CURL_READFUNC_ABORT) { failf(data, "operation aborted by callback"); @@ -302,7 +304,9 @@ CURLcode Curl_readrewind(struct connectdata *conn) if(data->set.seek_func) { int err; + Curl_set_in_callback(data, true); err = (data->set.seek_func)(data->set.seek_client, 0, SEEK_SET); + Curl_set_in_callback(data, false); if(err) { failf(data, "seek callback returned error %d", (int)err); return CURLE_SEND_FAIL_REWIND; @@ -311,8 +315,10 @@ CURLcode Curl_readrewind(struct connectdata *conn) else if(data->set.ioctl_func) { curlioerr err; + Curl_set_in_callback(data, true); err = (data->set.ioctl_func)(data, CURLIOCMD_RESTARTREAD, data->set.ioctl_client); + Curl_set_in_callback(data, false); infof(data, "the ioctl callback returned %d\n", (int)err); if(err) { |