diff options
| author | Fabian Frank <fabian@pagefault.de> | 2014-02-09 23:38:55 -0800 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-02-10 13:06:17 +0100 |
| commit | 909a68c1216b6ea5dbeceaedecec16a0599793d1 (patch) | |
| tree | 830bfa629484d94a9f17e9bb285e8a0726e75eee /docs | |
| parent | 70bd9784de06c0154663126e406b946befef2b5a (diff) | |
NPN/ALPN: allow disabling via command line
when using --http2 one can now selectively disable NPN or ALPN with
--no-alpn and --no-npn. for now honored with NSS only.
TODO: honor this option with GnuTLS and OpenSSL
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/curl.1 | 12 | ||||
| -rw-r--r-- | docs/libcurl/symbols-in-versions | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index 94f4cd845..722d1190b 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -133,6 +133,18 @@ version. (Added in 7.33.0) .IP "--http2" (HTTP) Tells curl to issue its requests using HTTP 2. This requires that the underlying libcurl was built to support it. (Added in 7.33.0) +.IP "--no-npn" +Disable the NPN TLS extension. NPN is enabled by default if libcurl was built +with an SSL library that supports NPN. NPN is used by a libcurl that supports +HTTP 2 to negoatiate HTTP 2 support with the server during https sessions. + +(Added in 7.36.0) +.IP "--no-alpn" +Disable the ALPN TLS extension. ALPN is enabled by default if libcurl was built +with an SSL library that supports ALPN. ALPN is used by a libcurl that supports +HTTP 2 to negoatiate HTTP 2 support with the server during https sessions. + +(Added in 7.36.0) .IP "-1, --tlsv1" (SSL) Forces curl to use TLS version 1 when negotiating with a remote TLS server. diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 432f180ec..a3bc7a507 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -495,6 +495,8 @@ CURLOPT_SSLKEY 7.9.3 CURLOPT_SSLKEYPASSWD 7.9.3 7.17.0 CURLOPT_SSLKEYTYPE 7.9.3 CURLOPT_SSLVERSION 7.1 +CURLOPT_SSL_ENABLE_ALPN 7.36.0 +CURLOPT_SSL_ENABLE_NPN 7.36.0 CURLOPT_SSL_CIPHER_LIST 7.9 CURLOPT_SSL_CTX_DATA 7.10.6 CURLOPT_SSL_CTX_FUNCTION 7.10.6 |