diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:31:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:31:50 -0800 |
| commit | 2202ab193160c5400c5025a0397e9c3e5a914946 (patch) | |
| tree | 01ee4906950fa7b7e6a270339e443860996cad02 | |
| parent | Merge branch 'jk/prune-packed-server-info' (diff) | |
| parent | imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY (diff) | |
| download | tgif-2202ab193160c5400c5025a0397e9c3e5a914946.tar.xz | |
Merge branch 'km/imap-send-libcurl-options'
Now imap-send learned to talk to the server using cURL library,
allow the same GIT_CURL_VERBOSE environment variable to control the
verbosity of the chattering.
* km/imap-send-libcurl-options:
imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY
imap-send.c: support GIT_CURL_VERBOSE
| -rw-r--r-- | imap-send.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/imap-send.c b/imap-send.c index 4dfe4c25d7..d69887da5a 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1421,8 +1421,8 @@ static CURL *setup_curl(struct imap_server_conf *srvc) strbuf_release(&auth); } - if (server.use_ssl) - curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL); + if (!server.use_ssl) + curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, server.ssl_verify); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, server.ssl_verify); @@ -1431,7 +1431,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc) curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); - if (0 < verbosity) + if (0 < verbosity || getenv("GIT_CURL_VERBOSE")) curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); return curl; |