From d654c3cce18da8b8ac111dbf35a75266ac636576 Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 12:42:36 +0000 Subject: [PATCH] Mirrored from envoyproxy/envoy @ 7d16b31ea529a888b0c1a5c090a117a7959766ca Signed-off-by: update-envoy[bot] <135279899+update-envoy[bot]@users.noreply.github.com> --- envoy/COMMIT | 2 +- envoy/config/core/v3/protocol.pb.go | 7 +++---- .../v3/http_connection_manager.pb.go | 7 ++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/envoy/COMMIT b/envoy/COMMIT index 1de99be6c5..27bc95fae0 100644 --- a/envoy/COMMIT +++ b/envoy/COMMIT @@ -1 +1 @@ -f837c480adad94e8d1a05ef648c26ffce7ecd286 +7d16b31ea529a888b0c1a5c090a117a7959766ca diff --git a/envoy/config/core/v3/protocol.pb.go b/envoy/config/core/v3/protocol.pb.go index 413f624b90..70be28739a 100755 --- a/envoy/config/core/v3/protocol.pb.go +++ b/envoy/config/core/v3/protocol.pb.go @@ -550,10 +550,9 @@ type HttpProtocolOptions struct { // :ref:`HTTP_DOWNSTREAM_CONNECTION_IDLE `. IdleTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"` // The maximum duration of a connection. The duration is defined as a period since a connection - // was established. If not set, there is no max duration. When max_connection_duration is reached - // and if there are no active streams, the connection will be closed. If the connection is a - // downstream connection and there are any active streams, the drain sequence will kick-in, - // and the connection will be force-closed after the drain period. See :ref:`drain_timeout + // was established. If not set, there is no max duration. When max_connection_duration is reached, + // the drain sequence will kick-in. The connection will be closed after the drain timeout period + // if there are no active streams. See :ref:`drain_timeout // `. MaxConnectionDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=max_connection_duration,json=maxConnectionDuration,proto3" json:"max_connection_duration,omitempty"` // The maximum number of headers. If unconfigured, the default diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go index 1d2ee35503..9d9a38bb25 100755 --- a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go +++ b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go @@ -452,9 +452,10 @@ type HttpConnectionManager struct { // race with the final GOAWAY frame. During this grace period, Envoy will // continue to accept new streams. After the grace period, a final GOAWAY // frame is sent and Envoy will start refusing new streams. Draining occurs - // both when a connection hits the idle timeout or during general server - // draining. The default grace period is 5000 milliseconds (5 seconds) if this - // option is not specified. + // either when a connection hits the idle timeout, when :ref:`max_connection_duration + // ` + // is reached, or during general server draining. The default grace period is + // 5000 milliseconds (5 seconds) if this option is not specified. DrainTimeout *durationpb.Duration `protobuf:"bytes,12,opt,name=drain_timeout,json=drainTimeout,proto3" json:"drain_timeout,omitempty"` // The delayed close timeout is for downstream connections managed by the HTTP connection manager. // It is defined as a grace period after connection close processing has been locally initiated