diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-13 16:51:29 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-13 10:39:04 -0700 |
commit | 32da6e6dafb1db563b6fa1ec80a21d58268e4ad1 (patch) | |
tree | 255f422f6bd3366b887941438e4e990d803960e4 /http.c | |
parent | http: centralize the accounting of libcurl dependencies (diff) | |
download | tgif-32da6e6dafb1db563b6fa1ec80a21d58268e4ad1.tar.xz |
http: don't hardcode the value of CURL_SOCKOPT_OK
Use the new git-curl-compat.h header to define CURL_SOCKOPT_OK to its
known value if we're on an older curl version that doesn't have it. It
was hardcoded in http.c in a15d069a198 (http: enable keepalive on TCP
sockets, 2013-10-12).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r-- | http.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -537,7 +537,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type) if (rc < 0) warning_errno("unable to set SO_KEEPALIVE on socket"); - return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */ + return CURL_SOCKOPT_OK; } static void set_curl_keepalive(CURL *c) |