admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http: don't hardcode the value of CURL_SOCKOPT_OK

Browse Source 
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 a15d069a19 (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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2021-09-13 16:51:29 +02:00
committed by Junio C Hamano
parent e4ff3b67c2
commit 32da6e6daf
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git-curl-compat.h
View File

@@ -20,10 +20,21 @@
* GIT_CURL_HAVE_X. If multiple similar symbols with the same prefix * GIT_CURL_HAVE_X. If multiple similar symbols with the same prefix
* were defined in the same version we pick one and check for that name. * were defined in the same version we pick one and check for that name.
* *
* We may also define a missing CURL_* symbol to its known value, if
* doing so is sufficient to add support for it to older versions that
* don't have it.
*
* Keep any symbols in date order of when their support was * Keep any symbols in date order of when their support was
* introduced, oldest first, in the official version of cURL library. * introduced, oldest first, in the official version of cURL library.
*/ */
/**
* 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. * CURLOPT_TCP_KEEPALIVE was added in 7.25.0, released in March 2012.
*/ */

2
http.c
View File

@@ -537,7 +537,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
if (rc < 0) if (rc < 0)
warning_errno("unable to set SO_KEEPALIVE on socket"); 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) static void set_curl_keepalive(CURL *c)