From c6c5738ef8e9bd9d587d654e3b6e86413d7db870 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Thu, 4 Oct 2018 15:56:24 +0000 Subject: [PATCH] network: reintroduce #4382 (delayed conn close) with segv fix (#4587) Re-enable the changes reverted in 9d32e5c2a14cd9ab96b6e77fb04f7bd77b2c0d71, which were originally merged as part of #4382. Signed-off-by: Andres Guedez Mirrored from https://github.com/envoyproxy/envoy @ b16f5299e45ca71a36ec6f7fc006ed311b58a843 --- .../http_connection_manager/v2/http_connection_manager.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto index 1a7042c6..4c8c93ac 100644 --- a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto +++ b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto @@ -175,7 +175,6 @@ message HttpConnectionManager { // option is not specified. google.protobuf.Duration drain_timeout = 12 [(gogoproto.stdduration) = true]; - // [#not-implemented-hide:] // 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 // during which Envoy will flush the write buffers for the connection and await the peer to close