From 8b6da850477205c670ca65e351106f17931fd70c Mon Sep 17 00:00:00 2001 From: James Synge Date: Wed, 10 Apr 2019 16:01:33 -0400 Subject: [PATCH 1/2] Update websocket.rst Link to RFC 8441 rather than the earlier working group draft. Fixes envoyproxy#6528 (well, it was much better than I thought, just had an old link). Signed-off-by: James Synge --- docs/root/intro/arch_overview/websocket.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/root/intro/arch_overview/websocket.rst b/docs/root/intro/arch_overview/websocket.rst index dab57656eb276..6de895be64db8 100644 --- a/docs/root/intro/arch_overview/websocket.rst +++ b/docs/root/intro/arch_overview/websocket.rst @@ -48,7 +48,7 @@ In this case, if a client is for example using WebSocket, we want the Websocket upstream server functionally intact, which means it needs to traverse the HTTP/2 hop. This is accomplished via -`extended CONNECT `_ support. The +`extended CONNECT `_ support. The WebSocket request will be transformed into an HTTP/2 CONNECT stream, with :protocol header indicating the original upgrade, traverse the HTTP/2 hop, and be downgraded back into an HTTP/1 WebSocket Upgrade. This same Upgrade-CONNECT-Upgrade transformation will be performed on any From 9aac22277a94f9c70507e7338885690c7ade20c4 Mon Sep 17 00:00:00 2001 From: James Synge Date: Thu, 11 Apr 2019 13:56:12 -0400 Subject: [PATCH 2/2] Updated docs to remove "alpha" as per request. Changed "websocket" to "WebSocket" in the two places with inconsistent capitalization from the rest of the document. Signed-off-by: James Synge --- docs/root/intro/arch_overview/websocket.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/root/intro/arch_overview/websocket.rst b/docs/root/intro/arch_overview/websocket.rst index 6de895be64db8..e854eb53bb271 100644 --- a/docs/root/intro/arch_overview/websocket.rst +++ b/docs/root/intro/arch_overview/websocket.rst @@ -32,15 +32,15 @@ laid out below, but custom filter chains can only be configured on a per-HttpCon | F | F | F | +-----------------------+-------------------------+-------------------+ -Note that the statistics for upgrades are all bundled together so websocket +Note that the statistics for upgrades are all bundled together so WebSocket :ref:`statistics ` are tracked by stats such as downstream_cx_upgrades_total and downstream_cx_upgrades_active Handling H2 hops ^^^^^^^^^^^^^^^^ -Envoy currently has an alpha implementation of tunneling websockets over H2 streams for deployments -that prefer a uniform H2 mesh throughout, for example, for a deployment of the form: +Envoy supports tunneling WebSockets over H2 streams for deployments that prefer a uniform +H2 mesh throughout; this enables, for example, a deployment of the form: [Client] ---- HTTP/1.1 ---- [Front Envoy] ---- HTTP/2 ---- [Sidecar Envoy ---- H1 ---- App]