aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2024-10-23 00:45:49 +0000
committerTaylor Blau <me@ttaylorr.com>2024-10-23 16:16:35 -0400
commit8bf7f9e1ff7a5c2138a0a707bf86bacc5feefd3e (patch)
tree83fb2697292ddbc950286f1d06445522bd32c787
parentef8ce8f3d4344fd3af049c17eeba5cd20d98b69f (diff)
downloadgit-8bf7f9e1ff7a5c2138a0a707bf86bacc5feefd3e.tar.xz
git-curl-compat: remove check for curl 7.21.5
libcurl 7.21.5 was released in April 2011, which is well over ten years ago, and no major operating system vendor is still providing security support for it. Debian 7, RHEL 7, and Ubuntu 12.04, all of which are out of mainstream security support, have all supported a newer version. Remove the check for this version and use this functionality unconditionally. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Taylor Blau <me@ttaylorr.com>
-rw-r--r--git-curl-compat.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/git-curl-compat.h b/git-curl-compat.h
index e1d0bdd273..c24ed686c1 100644
--- a/git-curl-compat.h
+++ b/git-curl-compat.h
@@ -29,13 +29,6 @@
*/
/**
- * CURL_SOCKOPT_OK was added in 7.21.5, released in April 2011.
- */
-#if LIBCURL_VERSION_NUM < 0x071505
-#define CURL_SOCKOPT_OK 0
-#endif
-
-/**
* CURLOPT_TCP_KEEPALIVE was added in 7.25.0, released in March 2012.
*/
#if LIBCURL_VERSION_NUM >= 0x071900