]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-curl-compat: remove check for curl 7.44.0
authorbrian m. carlson <sandals@crustytoothpaste.net>
Wed, 23 Oct 2024 00:45:54 +0000 (00:45 +0000)
committerTaylor Blau <me@ttaylorr.com>
Wed, 23 Oct 2024 20:16:35 +0000 (16:16 -0400)
libcurl 7.44.0 was released in August 2015, which is over nine years
ago, and no major operating system vendor is still providing security
support for it.  Debian 9 and Ubuntu 16.04, both of which are out of
mainstream security support, have supported a newer version, and RHEL 8,
which is still in support, also has a newer version.

Remove the check for this version and use this functionality
unconditionally.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
git-curl-compat.h
http.c

index cd970e34d6c70c0a5e8dfdbf011bb0470dfa1530..6b05d70d42dc55025fa2749bce240d1e71662df0 100644 (file)
  * introduced, oldest first, in the official version of cURL library.
  */
 
-/**
- * CURLSSLOPT_NO_REVOKE was added in 7.44.0, released in August 2015.
- *
- * The CURLSSLOPT_NO_REVOKE is, has always been a macro, not an enum
- * field (checked on curl version 7.78.0)
- */
-#if LIBCURL_VERSION_NUM >= 0x072c00
-#define GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE 1
-#endif
-
 /**
  * CURLOPT_PROXY_CAINFO was added in 7.52.0, released in August 2017.
  */
diff --git a/http.c b/http.c
index 945df9a6281626d58e1975f94278fadd2ed27508..bdf8bf7b591cc76fe719bc12aaec46ea5e6d6f73 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1048,11 +1048,7 @@ static CURL *get_curl_handle(void)
 
        if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
            !http_schannel_check_revoke) {
-#ifdef GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE
                curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
-#else
-               warning(_("CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"));
-#endif
        }
 
        if (http_proactive_auth != PROACTIVE_AUTH_NONE)