http: use curl's tcp keepalive if available
Commit a15d069 taught git to use curl's SOCKOPTFUNCTION hook to turn on TCP keepalives. However, modern versions of curl have a TCP_KEEPALIVE option, which can do this for us. As an added bonus, the curl code knows how to turn on keepalive for a much wider variety of platforms. The only downside to using this option is that not everybody has a new enough curl. Let's split our keepalive options into three conditionals: 1. With curl 7.25.0 and newer, we rely on curl to do it right. 2. With older curl that still knows SOCKOPTFUNCTION, we use the code from a15d069. 3. Otherwise, we are out of luck, and the call is a no-op. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Oct 14, 2013 at 20:06 UTC
47ce115370cba8ebfced696f9997e718c465435d
1 file changed
+20
-4
http.c
+20
-4
@@ -233,7 +233,13 @@ static int has_cert_password(void)
233
return 0;
234
}
235
236
-/* curl 7.25.0 has CURLOPT_TCP_KEEPALIVE, too, but we support older curl */
236
+#if LIBCURL_VERSION_NUM >= 0x071900
237
+static void set_curl_keepalive(CURL *c)
238
+{
239
+ curl_easy_setopt(c, CURLOPT_TCP_KEEPALIVE, 1);
240
+}
241
+
242
+#elif LIBCURL_VERSION_NUM >= 0x071000
243
static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
244
{
245
int ka = 1;
@@ -251,6 +257,18 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
257
return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */
258
}
259
260
+static void set_curl_keepalive(CURL *c)
261
+{
262
+ curl_easy_setopt(c, CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
263
+}
264
+
265
+#else
266
+static void set_curl_keepalive(CURL *c)
267
+{
268
+ /* not supported on older curl versions */
269
+}
270
+#endif
271
+
272
static CURL *get_curl_handle(void)
273
{
274
CURL *result = curl_easy_init();
@@ -316,9 +334,7 @@ static CURL *get_curl_handle(void)
334
if (curl_http_proxy)
335
curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
336
319
-#if LIBCURL_VERSION_NUM >= 0x071000
320
- curl_easy_setopt(result, CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
321
-#endif
337
+ set_curl_keepalive(result);
338
339
return result;
340
}