mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
Merge branch 'js/imap-send-curl-compilation-fix' into maint
"git imap-send" did not compile well with older version of cURL library. * js/imap-send-curl-compilation-fix: imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
This commit is contained in:
commit
c378862b1e
|
@ -1422,11 +1422,15 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
|
|||
curl_easy_setopt(curl, CURLOPT_PORT, server.port);
|
||||
|
||||
if (server.auth_method) {
|
||||
#if LIBCURL_VERSION_NUM < 0x072200
|
||||
warning("No LOGIN_OPTIONS support in this cURL version");
|
||||
#else
|
||||
struct strbuf auth = STRBUF_INIT;
|
||||
strbuf_addstr(&auth, "AUTH=");
|
||||
strbuf_addstr(&auth, server.auth_method);
|
||||
curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, auth.buf);
|
||||
strbuf_release(&auth);
|
||||
#endif
|
||||
}
|
||||
|
||||
if (!server.use_ssl)
|
||||
|
|
Loading…
Reference in a new issue