undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/imap-send-curl-compilation-fix'

Browse Source 
"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:
Junio C Hamano 2015-10-30 13:06:58 -07:00
commit e88e424f4c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imap-send.c
View File

@ -1421,11 +1421,15 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
curl_easy_setopt(curl, CURLOPT_PORT, server.port); curl_easy_setopt(curl, CURLOPT_PORT, server.port);
if (server.auth_method) { if (server.auth_method) {
#if LIBCURL_VERSION_NUM < 0x072200
warning("No LOGIN_OPTIONS support in this cURL version");
#else
struct strbuf auth = STRBUF_INIT; struct strbuf auth = STRBUF_INIT;
strbuf_addstr(&auth, "AUTH="); strbuf_addstr(&auth, "AUTH=");
strbuf_addstr(&auth, server.auth_method); strbuf_addstr(&auth, server.auth_method);
curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, auth.buf); curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, auth.buf);
strbuf_release(&auth); strbuf_release(&auth);
#endif
} }
if (!server.use_ssl) if (!server.use_ssl)