Skip to content

Commit 5c91da6

Browse files
bk2204ttaylorr
authored andcommitted
git-curl-compat: remove check for curl 7.44.0
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 <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent f47a1fa commit 5c91da6

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

git-curl-compat.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@
2828
* introduced, oldest first, in the official version of cURL library.
2929
*/
3030

31-
/**
32-
* CURLSSLOPT_NO_REVOKE was added in 7.44.0, released in August 2015.
33-
*
34-
* The CURLSSLOPT_NO_REVOKE is, has always been a macro, not an enum
35-
* field (checked on curl version 7.78.0)
36-
*/
37-
#if LIBCURL_VERSION_NUM >= 0x072c00
38-
#define GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE 1
39-
#endif
40-
4131
/**
4232
* CURLOPT_PROXY_CAINFO was added in 7.52.0, released in August 2017.
4333
*/

http.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,11 +1048,7 @@ static CURL *get_curl_handle(void)
10481048

10491049
if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
10501050
!http_schannel_check_revoke) {
1051-
#ifdef GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE
10521051
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
1053-
#else
1054-
warning(_("CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"));
1055-
#endif
10561052
}
10571053

10581054
if (http_proactive_auth != PROACTIVE_AUTH_NONE)

0 commit comments

Comments
 (0)