diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-23 13:44:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 13:44:47 -0700 |
| commit | 8f79fb6445cb1d17c5527ba958e460725e7b111e (patch) | |
| tree | 1fc91c5c9f904d5f38a17a6804f6a4f856f12847 /imap-send.c | |
| parent | Merge branch 'po/git-config-doc-mentions-help-c' (diff) | |
| parent | http: don't hardcode the value of CURL_SOCKOPT_OK (diff) | |
| download | tgif-8f79fb6445cb1d17c5527ba958e460725e7b111e.tar.xz | |
Merge branch 'ab/http-drop-old-curl-plus'
Conditional compilation around versions of libcURL has been
straightened out.
* ab/http-drop-old-curl-plus:
http: don't hardcode the value of CURL_SOCKOPT_OK
http: centralize the accounting of libcurl dependencies
http: correct curl version check for CURLOPT_PINNEDPUBLICKEY
http: correct version check for CURL_HTTP_VERSION_2
http: drop support for curl < 7.18.0 (again)
Makefile: drop support for curl < 7.9.8 (again)
INSTALL: mention that we need libcurl 7.19.4 or newer to build
INSTALL: reword and copy-edit the "libcurl" section
INSTALL: don't mention the "curl" executable at all
Diffstat (limited to 'imap-send.c')
| -rw-r--r-- | imap-send.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imap-send.c b/imap-send.c index 49a5f8aa59..e6090a0346 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1441,7 +1441,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred) curl_easy_setopt(curl, CURLOPT_PORT, server.port); if (server.auth_method) { -#if LIBCURL_VERSION_NUM < 0x072200 +#ifndef GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS warning("No LOGIN_OPTIONS support in this cURL version"); #else struct strbuf auth = STRBUF_INIT; |