aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-03-08 00:02:52 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-03-08 00:08:31 +0100
commit7e8b65c00bcaf3e7b6cf8244a556e36ed0a5a22b (patch)
tree4ffc2f2e68375c8ae3f0344b89a3448ca3b3a479
parent52a0b934ef397f2caec0adef06847065ff7fee2b (diff)
HTTP2.md: mention the disable ALPN and NPN options
-rw-r--r--docs/HTTP2.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/HTTP2.md b/docs/HTTP2.md
index 44b5273dd..c9fb608fd 100644
--- a/docs/HTTP2.md
+++ b/docs/HTTP2.md
@@ -36,12 +36,14 @@ Over an https:// URL
If `CURLOPT_HTTP_VERSION` is set to `CURL_HTTP_VERSION_2_0`, libcurl will use
ALPN (or NPN) to negotiate which protocol to continue with. Possibly introduce
an option that will cause libcurl to fail if not possible to use HTTP/2.
-Consider options to explicitly disable ALPN and/or NPN.
ALPN is the TLS extension that HTTP/2 is expected to use. The NPN extension is
for a similar purpose, was made prior to ALPN and is used for SPDY so early
HTTP/2 servers are implemented using NPN before ALPN support is widespread.
+`CURLOPT_SSL_ENABLE_ALPN` and `CURLOPT_SSL_ENABLE_NPN` are offered to allow
+applications to explicitly disable ALPN or NPN.
+
SSL libs
--------