diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-12-02 13:57:38 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-12-06 14:55:52 +0100 |
| commit | 2b3dd01b779e4eff623a735792a915cde914b74a (patch) | |
| tree | 5c11c6cc0793b8df324316042bba7212eb338926 /include | |
| parent | b3f9c1aa09cbcdf6350d627f79f7d0e86cb178d3 (diff) | |
| download | curl-2b3dd01b779e4eff623a735792a915cde914b74a.tar.gz | |
multi: handle errors returned from socket/timer callbacks
The callbacks were partially documented to support this. Now the
behavior is documented and returning error from either of these
callbacks will effectively kill all currently ongoing transfers.
Added test 530 to verify
Reported-by: Marcelo Juchem
Fixes #8083
Closes #8089
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/multi.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/curl/multi.h b/include/curl/multi.h index 37f9829b3..91cd95d32 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2021, 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 @@ -73,7 +73,8 @@ typedef enum { CURLM_RECURSIVE_API_CALL, /* an api function was called from inside a callback */ CURLM_WAKEUP_FAILURE, /* wakeup is unavailable or failed */ - CURLM_BAD_FUNCTION_ARGUMENT, /* function called with a bad parameter */ + CURLM_BAD_FUNCTION_ARGUMENT, /* function called with a bad parameter */ + CURLM_ABORTED_BY_CALLBACK, CURLM_LAST } CURLMcode; |