On Wed, Aug 09 2017, Jeff King jotted: > Since v2.12.0, Git does not compile with versions of curl > older than 7.19.4. That version of curl is about 8 years > old. This means it may still be used in some distributions > with long-running support periods. But the fact that we > haven't received a single bug report about the compile-time > breakage implies that nobody cares about building recent > releases on such platforms. This whole series looks good to me. As I commented on in the thread you referenced in 0/4 I think this is the right trade-off, and people like me who occasionally compile git on older systems can just easily package a newer curl as well if we need it. My reading of the curl history/docs is that you should squash this into this last patch. It's code that's now dead since we require 7.19.4. CURLAUTH_DIGEST_IE was added in 7.19.3, and as a comment this squash removes indicates CURLOPT_USE_SSL hasn't been needed since 7.16.4: https://curl.haxx.se/libcurl/c/CURLOPT_USE_SSL.html diff --git a/http.c b/http.c index 5280511c74..527bc56dc2 100644 --- a/http.c +++ b/http.c @@ -103,9 +103,7 @@ static int http_auth_methods_restricted; /* Modes for which empty_auth cannot actually help us. */ static unsigned long empty_auth_useless = CURLAUTH_BASIC -#ifdef CURLAUTH_DIGEST_IE | CURLAUTH_DIGEST_IE -#endif | CURLAUTH_DIGEST; static struct curl_slist *pragma_header; @@ -706,10 +704,8 @@ static CURL *get_curl_handle(void) if (curl_ftp_no_epsv) curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0); -#ifdef CURLOPT_USE_SSL if (curl_ssl_try) curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY); -#endif /* * CURL also examines these variables as a fallback; but we need to query diff --git a/http.h b/http.h index 29acfe8c55..66d2d3c539 100644 --- a/http.h +++ b/http.h @@ -16,15 +16,6 @@ #define DEFAULT_MAX_REQUESTS 5 -/* - * CURLOPT_USE_SSL was known as CURLOPT_FTP_SSL up to 7.16.4, - * and the constants were known as CURLFTPSSL_* -*/ -#if !defined(CURLOPT_USE_SSL) && defined(CURLOPT_FTP_SSL) -#define CURLOPT_USE_SSL CURLOPT_FTP_SSL -#define CURLUSESSL_TRY CURLFTPSSL_TRY -#endif - struct slot_results { CURLcode curl_result; long http_code;
