--- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1990,9 +1990,6 @@ bool HandleDownloadCommand(std::vector 0) { - res = ::curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); - check_curl_result(res, "DOWNLOAD cannot set timeout: "); - } - - if (inactivity_timeout > 0) { - // Give up if there is no progress for a long time. - ::curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1); - ::curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, inactivity_timeout); - } - // Need the progress helper's scope to last through the duration of // the curl_easy_perform call... so this object is declared at function // scope intentionally, rather than inside the "if(showProgress)" @@ -2331,15 +2305,6 @@ bool HandleUploadCommand(std::vector 0) { - res = ::curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); - check_curl_result(res, "UPLOAD cannot set timeout: "); - } - - if (inactivity_timeout > 0) { - // Give up if there is no progress for a long time. - ::curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1); - ::curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, inactivity_timeout); - } - // Need the progress helper's scope to last through the duration of // the curl_easy_perform call... so this object is declared at function // scope intentionally, rather than inside the "if(showProgress)" --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -483,7 +483,6 @@ if(COVERAGE_COMMAND) add_RunCMake_test(ctest_coverage -DCOVERAGE_COMMAND=${COVERAGE_COMMAND}) endif() add_RunCMake_test(ctest_start) -add_RunCMake_test(ctest_submit) add_RunCMake_test(ctest_test -DIMAGE_DIR=${CMAKE_SOURCE_DIR}/Utilities/Sphinx/static ) @@ -504,7 +503,6 @@ foreach(var list(APPEND file-DOWNLOAD_ARGS -D${var}=${${var}}) endif() endforeach() -add_RunCMake_test(file-DOWNLOAD) add_RunCMake_test(file-RPATH -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}) add_RunCMake_test(find_file) add_RunCMake_test(find_library -DCYGWIN=${CYGWIN} -DMSYS=${MSYS}) --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -22,12 +22,12 @@ set(CURL_DISABLE_CRYPTO_AUTH OFF CACHE I set(CURL_DISABLE_DICT ON CACHE INTERNAL "Disable curl dict protocol?") set(CURL_DISABLE_DOH OFF) set(CURL_DISABLE_FILE OFF CACHE INTERNAL "Disable curl file protocol?") -set(CURL_DISABLE_FTP OFF CACHE INTERNAL "Disable curl ftp protocol?") +set(CURL_DISABLE_FTP ON CACHE INTERNAL "Disable curl ftp protocol?") set(CURL_DISABLE_GETOPTIONS OFF) set(CURL_DISABLE_GOPHER ON CACHE INTERNAL "Disable curl gopher protocol?") set(CURL_DISABLE_HSTS ON) -set(CURL_DISABLE_HTTP_AUTH OFF) -set(CURL_DISABLE_HTTP OFF CACHE INTERNAL "Disable curl http protocol?") +set(CURL_DISABLE_HTTP_AUTH ON) +set(CURL_DISABLE_HTTP ON CACHE INTERNAL "Disable curl http protocol?") set(CURL_DISABLE_IMAP ON CACHE INTERNAL "Disable curl imap protocol?") set(CURL_DISABLE_LDAP ON CACHE INTERNAL "Disable curl ldap protocol?") set(CURL_DISABLE_LDAPS ON CACHE INTERNAL "Disable curl ldaps protocol?") @@ -40,12 +40,12 @@ set(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFI set(CURL_DISABLE_PARSEDATE OFF) set(CURL_DISABLE_POP3 ON CACHE INTERNAL "Disable curl pop3 protocol?") set(CURL_DISABLE_PROGRESS_METER OFF) -set(CURL_DISABLE_PROXY OFF CACHE INTERNAL "Do not disable curl proxy") +set(CURL_DISABLE_PROXY ON CACHE INTERNAL "Do not disable curl proxy") set(CURL_DISABLE_RTSP ON CACHE INTERNAL "Disable curl rtsp protocol?") set(CURL_DISABLE_SHUFFLE_DNS OFF) set(CURL_DISABLE_SMB OFF) set(CURL_DISABLE_SMTP ON CACHE INTERNAL "Disable curl smtp protocol?") -set(CURL_DISABLE_SOCKETPAIR OFF) +set(CURL_DISABLE_SOCKETPAIR ON) set(CURL_DISABLE_TELNET ON CACHE INTERNAL "Disable curl telnet protocol?") set(CURL_DISABLE_TFTP ON CACHE INTERNAL "Disable curl tftp protocol?") set(CURL_DISABLE_VERBOSE_STRINGS OFF CACHE INTERNAL "Do not disable curl verbosity") @@ -61,7 +61,7 @@ set(ENABLE_ALT_SVC OFF) set(ENABLE_CURLDEBUG OFF CACHE INTERNAL "No curl TrackMemory features") set(ENABLE_DEBUG OFF CACHE INTERNAL "No curl debug features") set(ENABLE_INET_PTON OFF CACHE INTERNAL "Set to OFF to prevent usage of inet_pton when building against modern SDKs while still requiring compatibility with older Windows versions, such as Windows XP, Windows Server 2003 etc.") -set(ENABLE_IPV6 ON CACHE INTERNAL "Enable curl IPv6 support detection") +set(ENABLE_IPV6 OFF CACHE INTERNAL "Enable curl IPv6 support detection") set(ENABLE_MANUAL OFF CACHE INTERNAL "No curl built-in manual") set(ENABLE_THREADED_RESOLVER OFF CACHE INTERNAL "No curl POSIX threaded DNS lookup") set(ENABLE_UNICODE OFF) @@ -77,8 +77,8 @@ set(HAVE_STRCASECMP 0) # we do not vendo set(HAVE_WIN32_WINNT 0) # we do not need this info set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") -set(USE_LIBIDN2 ON) -set(USE_NGHTTP2 ON) +set(USE_LIBIDN2 OFF) +set(USE_NGHTTP2 OFF) set(USE_NGTCP2 OFF) set(USE_QUICHE OFF) set(USE_WIN32_IDN OFF) @@ -323,7 +323,7 @@ option(CURL_DISABLE_DOH "disables DNS-ov mark_as_advanced(CURL_DISABLE_DOH) option(CURL_DISABLE_FILE "disables FILE" OFF) mark_as_advanced(CURL_DISABLE_FILE) -option(CURL_DISABLE_FTP "disables FTP" OFF) +option(CURL_DISABLE_FTP "disables FTP" ON) mark_as_advanced(CURL_DISABLE_FTP) option(CURL_DISABLE_GETOPTIONS "disables curl_easy_options API for existing options to curl_easy_setopt" OFF) mark_as_advanced(CURL_DISABLE_GETOPTIONS)