mirror of
https://github.com/git/git.git
synced 2024-12-15 12:53:36 +08:00
f44e6a2105
The CURLOPT_PROTOCOLS (and matching CURLOPT_REDIR_PROTOCOLS) flag was
deprecated in curl 7.85.0, and using it generate compiler warnings as of
curl 7.87.0. The path forward is to use CURLOPT_PROTOCOLS_STR, but we
can't just do so unilaterally, as it was only introduced less than a
year ago in 7.85.0.
Until that version becomes ubiquitous, we have to either disable the
deprecation warning or conditionally use the "STR" variant on newer
versions of libcurl. This patch switches to the new variant, which is
nice for two reasons:
- we don't have to worry that silencing curl's deprecation warnings
might cause us to miss other more useful ones
- we'd eventually want to move to the new variant anyway, so this gets
us set up (albeit with some extra ugly boilerplate for the
conditional)
There are a lot of ways to split up the two cases. One way would be to
abstract the storage type (strbuf versus a long), how to append
(strbuf_addstr vs bitwise OR), how to initialize, which CURLOPT to use,
and so on. But the resulting code looks pretty magical:
GIT_CURL_PROTOCOL_TYPE allowed = GIT_CURL_PROTOCOL_TYPE_INIT;
if (...http is allowed...)
GIT_CURL_PROTOCOL_APPEND(&allowed, "http", CURLOPT_HTTP);
and you end up with more "#define GIT_CURL_PROTOCOL_TYPE" macros than
actual code.
On the other end of the spectrum, we could just implement two separate
functions, one that handles a string list and one that handles bits. But
then we end up repeating our list of protocols (http, https, ftp, ftp).
This patch takes the middle ground. The run-time code is always there to
handle both types, and we just choose which one to feed to curl.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
138 lines
3.8 KiB
C
138 lines
3.8 KiB
C
#ifndef GIT_CURL_COMPAT_H
|
|
#define GIT_CURL_COMPAT_H
|
|
#include <curl/curl.h>
|
|
|
|
/**
|
|
* This header centralizes the declaration of our libcurl dependencies
|
|
* to make it easy to discover the oldest versions we support, and to
|
|
* inform decisions about removing support for older libcurl in the
|
|
* future.
|
|
*
|
|
* The oldest supported version of curl is documented in the "INSTALL"
|
|
* document.
|
|
*
|
|
* The source of truth for what versions have which symbols is
|
|
* https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions;
|
|
* the release dates are taken from curl.git (at
|
|
* https://github.com/curl/curl/).
|
|
*
|
|
* For each X symbol we need from curl we define our own
|
|
* GIT_CURL_HAVE_X. If multiple similar symbols with the same prefix
|
|
* were defined in the same version we pick one and check for that name.
|
|
*
|
|
* We may also define a missing CURL_* symbol to its known value, if
|
|
* doing so is sufficient to add support for it to older versions that
|
|
* don't have it.
|
|
*
|
|
* Keep any symbols in date order of when their support was
|
|
* introduced, oldest first, in the official version of cURL library.
|
|
*/
|
|
|
|
/**
|
|
* CURL_SOCKOPT_OK was added in 7.21.5, released in April 2011.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM < 0x071505
|
|
#define CURL_SOCKOPT_OK 0
|
|
#endif
|
|
|
|
/**
|
|
* CURLOPT_TCP_KEEPALIVE was added in 7.25.0, released in March 2012.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x071900
|
|
#define GITCURL_HAVE_CURLOPT_TCP_KEEPALIVE 1
|
|
#endif
|
|
|
|
|
|
/**
|
|
* CURLOPT_LOGIN_OPTIONS was added in 7.34.0, released in December
|
|
* 2013.
|
|
*
|
|
* If we start requiring 7.34.0 we might also be able to remove the
|
|
* code conditional on USE_CURL_FOR_IMAP_SEND in imap-send.c, see
|
|
* 1e16b255b95 (git-imap-send: use libcurl for implementation,
|
|
* 2014-11-09) and the check it added for "072200" in the Makefile.
|
|
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x072200
|
|
#define GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS 1
|
|
#endif
|
|
|
|
/**
|
|
* CURL_SSLVERSION_TLSv1_[012] was added in 7.34.0, released in
|
|
* December 2013.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x072200
|
|
#define GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_0
|
|
#endif
|
|
|
|
/**
|
|
* CURLOPT_PINNEDPUBLICKEY was added in 7.39.0, released in November
|
|
* 2014. CURLE_SSL_PINNEDPUBKEYNOTMATCH was added in that same version.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x072c00
|
|
#define GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY 1
|
|
#define GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH 1
|
|
#endif
|
|
|
|
/**
|
|
* CURL_HTTP_VERSION_2 was added in 7.43.0, released in June 2015.
|
|
*
|
|
* The CURL_HTTP_VERSION_2 alias (but not CURL_HTTP_VERSION_2_0) has
|
|
* always been a macro, not an enum field (checked on curl version
|
|
* 7.78.0)
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x072b00
|
|
#define GIT_CURL_HAVE_CURL_HTTP_VERSION_2 1
|
|
#endif
|
|
|
|
/**
|
|
* 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.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x073400
|
|
#define GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO 1
|
|
#endif
|
|
|
|
/**
|
|
* CURLOPT_PROXY_{KEYPASSWD,SSLCERT,SSLKEY} was added in 7.52.0,
|
|
* released in August 2017.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x073400
|
|
#define GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD 1
|
|
#endif
|
|
|
|
/**
|
|
* CURL_SSLVERSION_TLSv1_3 was added in 7.53.0, released in February
|
|
* 2017.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x073400
|
|
#define GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_3 1
|
|
#endif
|
|
|
|
/**
|
|
* CURLSSLSET_{NO_BACKENDS,OK,TOO_LATE,UNKNOWN_BACKEND} were added in
|
|
* 7.56.0, released in September 2017.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x073800
|
|
#define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
|
|
#endif
|
|
|
|
/**
|
|
* CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR were added in 7.85.0,
|
|
* released in August 2022.
|
|
*/
|
|
#if LIBCURL_VERSION_NUM >= 0x075500
|
|
#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1
|
|
#endif
|
|
|
|
#endif
|