http: drop support for curl < 7.19.3 and < 7.17.0 (again)
Remove the conditional use of CURLAUTH_DIGEST_IE and CURLOPT_USE_SSL. These two have been split from earlier simpler checks against LIBCURL_VERSION_NUM for ease of review. According to https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions the CURLAUTH_DIGEST_IE flag became available in 7.19.3, and CURLOPT_USE_SSL in 7.17.0. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jul 30, 2021 at 19:59 UTC
5db9d383590c37272a9f16464a66dfbd3a3c8aff
2 files changed
-13
http.c
-4
@@ -120,9 +120,7 @@ static int http_auth_methods_restricted;
120
/* Modes for which empty_auth cannot actually help us. */
121
static unsigned long empty_auth_useless =
122
CURLAUTH_BASIC
123
-#ifdef CURLAUTH_DIGEST_IE
123
| CURLAUTH_DIGEST_IE
125
-#endif
124
| CURLAUTH_DIGEST;
125
126
static struct curl_slist *pragma_header;
@@ -893,10 +891,8 @@ static CURL *get_curl_handle(void)
891
if (curl_ftp_no_epsv)
892
curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
893
896
-#ifdef CURLOPT_USE_SSL
894
if (curl_ssl_try)
895
curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY);
899
-#endif
896
897
/*
898
* CURL also examines these variables as a fallback; but we need to query
http.h
-9
@@ -12,15 +12,6 @@
12
13
#define DEFAULT_MAX_REQUESTS 5
14
15
-/*
16
- * CURLOPT_USE_SSL was known as CURLOPT_FTP_SSL up to 7.16.4,
17
- * and the constants were known as CURLFTPSSL_*
18
-*/
19
-#if !defined(CURLOPT_USE_SSL) && defined(CURLOPT_FTP_SSL)
20
-#define CURLOPT_USE_SSL CURLOPT_FTP_SSL
21
-#define CURLUSESSL_TRY CURLFTPSSL_TRY
22
-#endif
23
-
15
struct slot_results {
16
CURLcode curl_result;
17
long http_code;