summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-24 19:18:23 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-24 19:18:23 (GMT)
commit329cf7f3e3ef4d64b4bdd274ad2b6cc376a6cb0e (patch)
treee50a40c6b0dab526b45436d68592c0ba6bcfd883
parent845a46fb743cc036edd45e941be41ca55a3910b2 (diff)
parent646eedcfcb73548b723603626ac276f739ba5d1d (diff)
downloadCMake-329cf7f3e3ef4d64b4bdd274ad2b6cc376a6cb0e.zip
CMake-329cf7f3e3ef4d64b4bdd274ad2b6cc376a6cb0e.tar.gz
CMake-329cf7f3e3ef4d64b4bdd274ad2b6cc376a6cb0e.tar.bz2
Merge branch 'revert-file-alt-httpauth' into release-3.13
Merge-request: !2858
-rw-r--r--Source/cmFileCommand.cxx8
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 1f76703..5d34b71 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2906,10 +2906,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: ");
@@ -3209,10 +3205,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: ");