Skip to content

Commit

Permalink
http: correct version check for CURL_HTTP_VERSION_2
Browse files Browse the repository at this point in the history
In d73019f (http: add support selecting http version, 2018-11-08)
a dependency was added on CURL_HTTP_VERSION_2, but this feature was
introduced in curl version 7.43.0, not 7.47.0, as the incorrect
version check led us to believe.

As looking through the history of that commit on the mailing list will
reveal[1], the reason for this is that an earlier version of it
depended on CURL_HTTP_VERSION_2TLS, which was introduced in libcurl
7.47.0.

But the version that made it in in d73019f had dropped the
dependency on CURL_HTTP_VERSION_2TLS, but the corresponding version
check was not corrected.

The newest symbol we depend on is CURL_HTTP_VERSION_2. It was added in
7.33.0, but the CURL_HTTP_VERSION_2 alias we used was added in
7.47.0. So we could support an even older version here, but let's just
correct the checked version.

1. https://lore.kernel.org/git/pull.69.git.gitgitgadget@gmail.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
avar authored and gitster committed Sep 13, 2021
1 parent 7ce3dcd commit 2a7f646
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions http.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ static long get_curl_allowed_protocols(int from_user)
return allowed_protocols;
}

#if LIBCURL_VERSION_NUM >=0x072f00
#if LIBCURL_VERSION_NUM >=0x072b00
static int get_curl_http_version_opt(const char *version_string, long *opt)
{
int i;
Expand Down Expand Up @@ -774,7 +774,7 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
}

#if LIBCURL_VERSION_NUM >= 0x072f00 // 7.47.0
#if LIBCURL_VERSION_NUM >= 0x072b00
if (curl_http_version) {
long opt;
if (!get_curl_http_version_opt(curl_http_version, &opt)) {
Expand Down

0 comments on commit 2a7f646

Please sign in to comment.