aboutsummaryrefslogtreecommitdiff
path: root/docs/curl.1
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-02-09 19:04:08 +0100
committerDaniel Stenberg <daniel@haxx.se>2012-02-09 19:05:40 +0100
commit2a266c1c7c075f9faced0248ed3f870dac1fc749 (patch)
tree8d4b40101b70e2110c4e3101012765086ab3baa3 /docs/curl.1
parent705f0f7a5b6120bb783d139c9266b285a4c8acd8 (diff)
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.
Diffstat (limited to 'docs/curl.1')
-rw-r--r--docs/curl.13
1 files changed, 2 insertions, 1 deletions
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 <key>"
(SSL/SSH) Private key file name. Allows you to provide your private key in this
separate file.