aboutsummaryrefslogtreecommitdiffstats
path: root/git-curl-compat.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2023-02-06 09:29:44 +0100
committerJohannes Schindelin <johannes.schindelin@gmx.de>2023-02-06 09:29:44 +0100
commit6a53a59bf9986f99c1a8dd0f36e2b9d6033e89f2 (patch)
tree5391438b7b4b9604f97599b6b32451c8128f8714 /git-curl-compat.h
parentc508c30968a54913b1c1f08fcfccd6593a74544a (diff)
parent91da4a29e168ab465beb713fca4d389193f8f16c (diff)
downloadgit-6a53a59bf9986f99c1a8dd0f36e2b9d6033e89f2.tar.gz
Sync with 2.34.7
* maint-2.34: Git 2.34.7 http: support CURLOPT_PROTOCOLS_STR http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT Git 2.33.7 Git 2.32.6 Git 2.31.7 Git 2.30.8 apply: fix writing behind newly created symbolic links dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS clone: delay picking a transport until after get_repo_path() t5619: demonstrate clone_local() with ambiguous transport
Diffstat (limited to 'git-curl-compat.h')
-rw-r--r--git-curl-compat.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-curl-compat.h b/git-curl-compat.h
index 56a83b6bbd..fd96b3cdff 100644
--- a/git-curl-compat.h
+++ b/git-curl-compat.h
@@ -126,4 +126,12 @@
#define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
#endif
+/**
+ * CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR were added in 7.85.0,
+ * released in August 2022.
+ */
+#if LIBCURL_VERSION_NUM >= 0x075500
+#define GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR 1
+#endif
+
#endif