From 2a266c1c7c075f9faced0248ed3f870dac1fc749 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 9 Feb 2012 19:04:08 +0100 Subject: curl: use new library-side TCP_KEEPALIVE options Use the new library CURLOPT_TCP_KEEPALIVE rather than disabling this via the sockopt callback. If --keepalive-time is used, apply the value to CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL. --- docs/curl.1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/curl.1') diff --git a/docs/curl.1 b/docs/curl.1 index e92cf5132..5bc8f0df8 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -711,7 +711,8 @@ currently effective on operating systems offering the TCP_KEEPIDLE and TCP_KEEPINTVL socket options (meaning Linux, recent AIX, HP-UX and more). This option has no effect if \fI--no-keepalive\fP is used. (Added in 7.18.0) -If this option is used multiple times, the last occurrence sets the amount. +If this option is used multiple times, the last occurrence sets the amount. If +unspecified, the option defaults to 60 seconds. .IP "--key " (SSL/SSH) Private key file name. Allows you to provide your private key in this separate file. -- cgit v1.2.3