summaryrefslogtreecommitdiff
path: root/http.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-19 13:31:08 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-19 13:31:08 -0700
commit574d51b575d9025d57c610c3b571ca58d347d0da (patch)
tree5f409c38a354aace88e787d5417798cf6ded7d0d /http.h
parent1468a5839309033feb2e58943babdd48b8e2d151 (diff)
parent4bc444eb64173f770c1d1dba2ed3db393c2a9b18 (diff)
downloadgit-574d51b575d9025d57c610c3b571ca58d347d0da.tar.gz
Merge branch 'mv/ssl-ftp-curl'
Does anybody really use commit walkers over (s)ftp? * mv/ssl-ftp-curl: Support FTP-over-SSL/TLS for regular FTP
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 4dc53531ae..d77c1b54f2 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;