diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-10-01 22:59:30 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-10-02 09:35:37 +0200 |
| commit | 3997b3e2a4bcf0023d277a74b6187cdad46533b2 (patch) | |
| tree | b6a9dfe3f637e09f2e472f570dbc445c6218c69d /src/tool_setopt.h | |
| parent | 9a13f7c2a7ca5fca99622a6feeb29abc3b05d713 (diff) | |
| download | curl-3997b3e2a4bcf0023d277a74b6187cdad46533b2.tar.gz | |
curl: make --libcurl show binary posts correctly
Reported-by: Stephan Mühlstrasser
Fixes #6031
Closes #6032
Diffstat (limited to 'src/tool_setopt.h')
| -rw-r--r-- | src/tool_setopt.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tool_setopt.h b/src/tool_setopt.h index 9fe142cf1..3db88c6bf 100644 --- a/src/tool_setopt.h +++ b/src/tool_setopt.h @@ -98,14 +98,15 @@ CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *config, CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config, const char *name, CURLoption tag, struct curl_slist *list); -CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *config, +CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, + struct OperationConfig *config, const char *name, CURLoption tag, ...); #define my_setopt(x,y,z) \ - SETOPT_CHECK(tool_setopt(x, FALSE, global, #y, y, z), y) + SETOPT_CHECK(tool_setopt(x, FALSE, global, config, #y, y, z), y) #define my_setopt_str(x,y,z) \ - SETOPT_CHECK(tool_setopt(x, TRUE, global, #y, y, z), y) + SETOPT_CHECK(tool_setopt(x, TRUE, global, config, #y, y, z), y) #define my_setopt_enum(x,y,z) \ SETOPT_CHECK(tool_setopt_enum(x, global, #y, y, setopt_nv_ ## y, z), y) @@ -122,9 +123,9 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *config, #define my_setopt_slist(x,y,z) \ SETOPT_CHECK(tool_setopt_slist(x, global, #y, y, z), y) -#define res_setopt(x,y,z) tool_setopt(x, FALSE, global, #y, y, z) +#define res_setopt(x,y,z) tool_setopt(x, FALSE, global, config, #y, y, z) -#define res_setopt_str(x,y,z) tool_setopt(x, TRUE, global, #y, y, z) +#define res_setopt_str(x,y,z) tool_setopt(x, TRUE, global, config, #y, y, z) #else /* CURL_DISABLE_LIBCURL_OPTION */ |