diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-24 19:17:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-01-24 19:18:16 (GMT) |
| commit | cd8e31a1bf7429514078c2923a1a9580113f9d4f (patch) | |
| tree | 6a0b8a01e3e0e52bb4b3abb66ce9e992614af6a7 /Utilities/cmcurl/lib/formdata.c | |
| parent | e9c8ea75575afdb4e87b262641ee4071ef42b4c6 (diff) | |
| parent | af9e654045f11028e50dac4781e297834129a749 (diff) | |
| download | CMake-cd8e31a1bf7429514078c2923a1a9580113f9d4f.zip CMake-cd8e31a1bf7429514078c2923a1a9580113f9d4f.tar.gz CMake-cd8e31a1bf7429514078c2923a1a9580113f9d4f.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2018-01-23 (d6c21c8e)
Diffstat (limited to 'Utilities/cmcurl/lib/formdata.c')
| -rw-r--r-- | Utilities/cmcurl/lib/formdata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/formdata.c b/Utilities/cmcurl/lib/formdata.c index 3568ac5..d0579c5 100644 --- a/Utilities/cmcurl/lib/formdata.c +++ b/Utilities/cmcurl/lib/formdata.c @@ -907,7 +907,7 @@ CURLcode Curl_getformdata(struct Curl_easy *data, result = curl_mime_headers(part, file->contentheader, 0); /* Set the content type. */ - if(!result &&file->contenttype) + if(!result && file->contenttype) result = curl_mime_type(part, file->contenttype); /* Set field name. */ |