Skip to content

Commit 5db9d38

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 644de29 commit 5db9d38

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

http.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ static int http_auth_methods_restricted;
120120
/* Modes for which empty_auth cannot actually help us. */
121121
static unsigned long empty_auth_useless =
122122
CURLAUTH_BASIC
123-
#ifdef CURLAUTH_DIGEST_IE
124123
| CURLAUTH_DIGEST_IE
125-
#endif
126124
| CURLAUTH_DIGEST;
127125

128126
static struct curl_slist *pragma_header;
@@ -893,10 +891,8 @@ static CURL *get_curl_handle(void)
893891
if (curl_ftp_no_epsv)
894892
curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
895893

896-
#ifdef CURLOPT_USE_SSL
897894
if (curl_ssl_try)
898895
curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY);
899-
#endif
900896

901897
/*
902898
* CURL also examines these variables as a fallback; but we need to query

http.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@
1212

1313
#define DEFAULT_MAX_REQUESTS 5
1414

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-
2415
struct slot_results {
2516
CURLcode curl_result;
2617
long http_code;

0 commit comments

Comments
 (0)