From: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Date: Thu, 14 Sep 2017 07:52:11 +0000 (+0200)
Subject: imap-send: use curl by default when possible
X-Git-Tag: v2.15.0-rc0~63^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbba42bb32f2e896a5413d401c61a0022652fe2b;p=thirdparty%2Fgit.git

imap-send: use curl by default when possible

Set curl as the runtime default when it is available.
When linked against older curl versions (< 7_34_0) or without curl,
use the legacy imap implementation.

The goal is to validate feature parity between the legacy and
the curl implementation, deprecate the legacy implementation
later on and in the long term, hopefully drop it altogether.

Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/imap-send.c b/imap-send.c
index dd203da831..8c785f3ca2 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -35,11 +35,11 @@ typedef void *SSL;
 #include "http.h"
 #endif
 
-#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL)
-/* only available option */
+#if defined(USE_CURL_FOR_IMAP_SEND)
+/* Always default to curl if it's available. */
 #define USE_CURL_DEFAULT 1
 #else
-/* strictly opt in */
+/* We don't have curl, so continue to use the historical implementation */
 #define USE_CURL_DEFAULT 0
 #endif