diff options
author | Daniel Stenberg <daniel@haxx.se> | 2023-04-25 08:28:01 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2023-04-25 12:38:38 +0200 |
commit | 7815647d6582c0a4900be2e1de6c5e61272c496b (patch) | |
tree | 40ae2ddacadfddb1d5e26637158c8cf004da2c9d /lib/setopt.c | |
parent | e5af5b7905900a49522428f914ade3c28152bfd9 (diff) | |
download | curl-7815647d6582c0a4900be2e1de6c5e61272c496b.tar.gz |
lib: unify the upload/method handling
By making sure we set state.upload based on the set.method value and not
independently as set.upload, we reduce confusion and mixup risks, both
internally and externally.
Closes #11017
Diffstat (limited to 'lib/setopt.c')
-rw-r--r-- | lib/setopt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/setopt.c b/lib/setopt.c index 38f5711e4..0c3b9634d 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -333,8 +333,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) * We want to sent data to the remote host. If this is HTTP, that equals * using the PUT request. */ - data->set.upload = (0 != va_arg(param, long)) ? TRUE : FALSE; - if(data->set.upload) { + arg = va_arg(param, long); + if(arg) { /* If this is HTTP, PUT is what's needed to "upload" */ data->set.method = HTTPREQ_PUT; data->set.opt_no_body = FALSE; /* this is implied */ @@ -664,7 +664,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) } else data->set.method = HTTPREQ_GET; - data->set.upload = FALSE; break; #ifndef CURL_DISABLE_MIME @@ -888,7 +887,6 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) */ if(va_arg(param, long)) { data->set.method = HTTPREQ_GET; - data->set.upload = FALSE; /* switch off upload */ data->set.opt_no_body = FALSE; /* this is implied */ } break; |