diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-15 12:57:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-15 12:57:13 (GMT) |
| commit | 40e043eb98539e4f94fb8bcf290aee4b43864c3e (patch) | |
| tree | 0467255cdc2898ee40d0e028c4b1cced51ef447e | |
| parent | e14386db8f340d86917bfb81023f1a370c0392e8 (diff) | |
| parent | dbfece1004e7be7d0dc22bdec118c8d7e84bffa5 (diff) | |
| download | CMake-40e043eb98539e4f94fb8bcf290aee4b43864c3e.zip CMake-40e043eb98539e4f94fb8bcf290aee4b43864c3e.tar.gz CMake-40e043eb98539e4f94fb8bcf290aee4b43864c3e.tar.bz2 | |
Merge branch 'backport-3.17-file-upload-tls' into release-3.17
Merge-request: !4579
| -rw-r--r-- | Source/cmFileCommand.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 79110ab..e36abdc 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2051,6 +2051,13 @@ bool HandleUploadCommand(std::vector<std::string> const& args, cmFileCommandCurlDebugCallback); check_curl_result(res, "UPLOAD cannot set debug function: "); + // make sure default CAInfo is set + std::string const& cainfo_err = cmCurlSetCAInfo(curl, nullptr); + if (!cainfo_err.empty()) { + status.SetError(cainfo_err); + return false; + } + cmFileCommandVectorOfChar chunkResponse; cmFileCommandVectorOfChar chunkDebug; |