summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2013-04-07 22:10:39 +0300
committerJunio C Hamano <gitster@pobox.com>2013-04-12 08:52:23 -0700
commit4bc444eb64173f770c1d1dba2ed3db393c2a9b18 (patch)
tree493e7612a19fb8264c4f8db8c5535df7d396ca80 /http.h
parent5234b41f68ca1ab788513fdc059f9f2e01fd3f6e (diff)
downloadgit-4bc444eb64173f770c1d1dba2ed3db393c2a9b18.tar.gz
Support FTP-over-SSL/TLS for regular FTP
Add a boolean http.sslTry option which allows to enable AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. Default is false since it might trigger certificate verification errors on misconfigured servers. Signed-off-by: Modestas Vainius <modestas@vainius.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.h')
-rw-r--r--http.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/http.h b/http.h
index 25d1931398..097514dd6f 100644
--- a/http.h
+++ b/http.h
@@ -42,6 +42,15 @@
#define NO_CURL_IOCTL
#endif
+/*
+ * CURLOPT_USE_SSL was known as CURLOPT_FTP_SSL up to 7.16.4,
+ * and the constants were known as CURLFTPSSL_*
+*/
+#if !defined(CURLOPT_USE_SSL) && defined(CURLOPT_FTP_SSL)
+#define CURLOPT_USE_SSL CURLOPT_FTP_SSL
+#define CURLUSESSL_TRY CURLFTPSSL_TRY
+#endif
+
struct slot_results {
CURLcode curl_result;
long http_code;