diff options
Diffstat (limited to 'docs/curl.1')
| -rw-r--r-- | docs/curl.1 | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index df6db822..12725db4 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -22,7 +22,7 @@ .\" .\" DO NOT EDIT. Generated by the curl project gen.pl man page generator. .\" -.TH curl 1 "November 16, 2016" "Curl 7.61.0" "Curl Manual" +.TH curl 1 "November 16, 2016" "Curl 7.61.1" "Curl Manual" .SH NAME curl \- transfer a URL @@ -251,6 +251,13 @@ nickname contains ":", it needs to be preceded by "\\" so that it is not recognized as password delimiter. If the nickname contains "\\", it needs to be escaped as "\\\\" so that it is not recognized as an escape character. +If curl is built against OpenSSL library, and the engine pkcs11 is available, +then a PKCS#11 URI (RFC 7512) can be used to specify a certificate located in +a PKCS#11 device. A string beginning with "pkcs11:" will be interpreted as a +PKCS#11 URI. If a PKCS#11 URI is provided, then the \fI--engine\fP option will be set +as "pkcs11" if none was provided and the \fI--cert-type\fP option will be set as +"ENG" if none was provided. + (iOS and macOS only) If curl is built against Secure Transport, then the certificate string can either be the name of a certificate/private key in the system or user keychain, or the path to a PKCS#12-encoded certificate and @@ -1120,6 +1127,13 @@ If this option is used several times, the last one will be used. file. For SSH, if not specified, curl tries the following candidates in order: '~/.ssh/id_rsa', '~/.ssh/id_dsa', './id_rsa', './id_dsa'. +If curl is built against OpenSSL library, and the engine pkcs11 is available, +then a PKCS#11 URI (RFC 7512) can be used to specify a private key located in a +PKCS#11 device. A string beginning with "pkcs11:" will be interpreted as a +PKCS#11 URI. If a PKCS#11 URI is provided, then the \fI--engine\fP option will be set +as "pkcs11" if none was provided and the \fI--key-type\fP option will be set as +"ENG" if none was provided. + If this option is used several times, the last one will be used. .IP "--krb <level>" (FTP) Enable Kerberos authentication and use. The level must be entered and should @@ -2067,7 +2081,7 @@ Added in 7.12.3. If a transient error is returned when curl tries to perform a transfer, it will retry this number of times before giving up. Setting the number to 0 makes curl do no retries (which is the default). Transient error means either: -a timeout, an FTP 4xx response code or an HTTP 5xx response code. +a timeout, an FTP 4xx response code or an HTTP 408 or 5xx response code. When curl is about to retry a transfer, it will first wait one second and then for all forthcoming retries it will double the waiting time until it reaches @@ -2745,9 +2759,10 @@ protocol that curl supports and as specified in a URL. FTP, FTPS, POP3, IMAP, SMTP, LDAP etc. .IP "ALL_PROXY [protocol://]<host>[:port]" Sets the proxy server to use if no protocol-specific proxy is set. -.IP "NO_PROXY <comma-separated list of hosts>" +.IP "NO_PROXY <comma-separated list of hosts/domains>" list of host names that shouldn't go through any proxy. If set to an asterisk -\&'*' only, it matches all hosts. +\&'*' only, it matches all hosts. Each name in this list is matched as either +a domain name which contains the hostname, or the hostname itself. This environment variable disables use of the proxy even when specified with the \fI-x, --proxy\fP option. That is |