[PATCHv2 4/4] imap-send: use curl by default

From: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Date: Aug 8, 2017, 07:48 UTC
Message-ID: <ee64e0d5-49e7-9e6f-a1f0-fea42557e44e@morey-chaisemartin.com>
In-Reply-To: <3637fd31-3120-eca0-b7ee-8e6e324b6b58@morey-chaisemartin.com>

Now that curl is enable by default, use the curl implementation for imap too. The goal is to validate feature parity between the legacy and the curl implementation, deprecate thee legacy implementation later on and in the long term, hopefully drop it altogether.

Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
---
 imap-send.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/imap-send.c b/imap-send.c
index 5e80edaff..138d776f7 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

-- 
2.14.0.rc1.16.gcc208c97c