From 73a00d15156c0b7fc52b40e6fbd633f48119506d Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 02:36:03 +0000 Subject: [PATCH] Mirrored from envoyproxy/envoy @ 7f84968b32bf33f93fb48e5fcfc3e14fbea95301 Signed-off-by: update-envoy[bot] <135279899+update-envoy[bot]@users.noreply.github.com> --- envoy/COMMIT | 2 +- envoy/config/route/v3/route_components.pb.go | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/envoy/COMMIT b/envoy/COMMIT index a49016b441..1940791a1f 100644 --- a/envoy/COMMIT +++ b/envoy/COMMIT @@ -1 +1 @@ -7730f8bb5e0aeaa807a88d88d5c39a517b735f89 +7f84968b32bf33f93fb48e5fcfc3e14fbea95301 diff --git a/envoy/config/route/v3/route_components.pb.go b/envoy/config/route/v3/route_components.pb.go index 1d9d1017f9..8893b410d0 100755 --- a/envoy/config/route/v3/route_components.pb.go +++ b/envoy/config/route/v3/route_components.pb.go @@ -1477,11 +1477,10 @@ type RouteMatch_SafeRegex struct { } type RouteMatch_ConnectMatcher_ struct { - // If this is used as the matcher, the matcher will only match CONNECT requests. - // Note that this will not match HTTP/2 upgrade-style CONNECT requests - // (WebSocket and the like) as they are normalized in Envoy as HTTP/1.1 style - // upgrades. - // This is the only way to match CONNECT requests for HTTP/1.1. For HTTP/2, + // If this is used as the matcher, the matcher will only match CONNECT or CONNECT-UDP requests. + // Note that this will not match other Extended CONNECT requests (WebSocket and the like) as + // they are normalized in Envoy as HTTP/1.1 style upgrades. + // This is the only way to match CONNECT requests for HTTP/1.1. For HTTP/2 and HTTP/3, // where Extended CONNECT requests may have a path, the path matchers will work if // there is a path present. // Note that CONNECT support is currently considered alpha in Envoy. @@ -4221,7 +4220,7 @@ func (x *RouteMatch_TlsContextMatchOptions) GetValidated() *wrappers.BoolValue { return nil } -// An extensible message for matching CONNECT requests. +// An extensible message for matching CONNECT or CONNECT-UDP requests. type RouteMatch_ConnectMatcher struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache