aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-03-09 11:09:39 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-03-09 11:09:39 +0100
commitb6665c7a44c78b064042c005af67c9e7a420a497 (patch)
treea2ffe14f0597e94a14e4c456b84fdace2de9f045
parentb7f3fe125a53fdf20ba20276626a8d26b5941742 (diff)
HTTP2.md: add CURL_HTTP_VERSION_2TLS and updated alt-svc link
-rw-r--r--docs/HTTP2.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/HTTP2.md b/docs/HTTP2.md
index c2ff9af73..bf5382070 100644
--- a/docs/HTTP2.md
+++ b/docs/HTTP2.md
@@ -37,6 +37,9 @@ 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.
+`CURL_HTTP_VERSION_2TLS` was added in 7.47.0 as a way to ask libcurl to prefer
+HTTP/2 for HTTPS but stick to 1.1 by default for plain old HTTP connections.
+
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.
@@ -99,7 +102,7 @@ same origin server that you get the response from. A browser or long-living
client can use that hint to create a new connection asynchronously. For
libcurl, we may introduce a way to bring such clues to the applicaton and/or
let a subsequent request use the alternate route
-automatically. [Spec](https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-05)
+automatically. [Spec](https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-14)
TODO
----