diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 12:50:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 12:51:25 (GMT) |
| commit | a5f7652fb9325c285d2e8a76404120b83fab79ea (patch) | |
| tree | 109f9dafae34d728215011503e09f0d0071cdf51 | |
| parent | 29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e (diff) | |
| parent | 646eedcfcb73548b723603626ac276f739ba5d1d (diff) | |
| download | CMake-a5f7652fb9325c285d2e8a76404120b83fab79ea.zip CMake-a5f7652fb9325c285d2e8a76404120b83fab79ea.tar.gz CMake-a5f7652fb9325c285d2e8a76404120b83fab79ea.tar.bz2 | |
Merge topic 'revert-file-alt-httpauth'
646eedcfcb Revert "file: Allow DOWNLOAD/UPLOAD using alternate authentication methods"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2858
| -rw-r--r-- | Source/cmFileCommand.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 999af54..06da29a 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2916,10 +2916,6 @@ bool cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); check_curl_result(res, "DOWNLOAD cannot set url: "); - // enable auth - res = ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); - check_curl_result(res, "DOWNLOAD cannot set httpauth: "); - // enable HTTP ERROR parsing res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1); check_curl_result(res, "DOWNLOAD cannot set http failure option: "); @@ -3219,10 +3215,6 @@ bool cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args) res = ::curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); check_curl_result(res, "UPLOAD cannot set url: "); - // enable auth - res = ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); - check_curl_result(res, "UPLOAD cannot set httpauth: "); - res = ::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cmWriteToMemoryCallback); check_curl_result(res, "UPLOAD cannot set write function: "); |