Skip to content

Commit 28955cd

Browse files
authored
Update Envoy to e1ede96 (June 6th 2022). update argument type const Envoy::StreamInfo::StreamInfo& to Envoy::StreamInfo::StreamInfo& for StreamDecoder::onPoolReady. (#858)
Update nighthawk stream_decoder to match the envoy conn_pool API change envoyproxy/envoy#21344. Signed-off-by: fei-deng <feid@google.com>
1 parent af3589f commit 28955cd

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

bazel/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

3-
ENVOY_COMMIT = "e4f443a075b9fd8ad194444778144457c5d4b83a"
4-
ENVOY_SHA = "d5a88e46076f8839c6ba09e8b60d2b67e08ec406692306ad417dd58c1f7e12f6"
3+
ENVOY_COMMIT = "e1ede969bf366d098f57c6665ab0eeee377701be"
4+
ENVOY_SHA = "04f1ea95dba9996006adbbf74f59a0a9d14d89643108a9728e61b8c1760098c9"
55

66
HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020
77
HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"

source/client/stream_decoder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void StreamDecoder::onPoolFailure(Envoy::Http::ConnectionPool::PoolFailureReason
102102

103103
void StreamDecoder::onPoolReady(Envoy::Http::RequestEncoder& encoder,
104104
Envoy::Upstream::HostDescriptionConstSharedPtr,
105-
const Envoy::StreamInfo::StreamInfo&,
105+
Envoy::StreamInfo::StreamInfo&,
106106
absl::optional<Envoy::Http::Protocol>) {
107107
// Make sure we hear about stream resets on the encoder.
108108
encoder.getStream().addCallbacks(*this);

source/client/stream_decoder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class StreamDecoder : public Envoy::Http::ResponseDecoder,
8888
Envoy::Upstream::HostDescriptionConstSharedPtr host) override;
8989
void onPoolReady(Envoy::Http::RequestEncoder& encoder,
9090
Envoy::Upstream::HostDescriptionConstSharedPtr host,
91-
const Envoy::StreamInfo::StreamInfo& stream_info,
91+
Envoy::StreamInfo::StreamInfo& stream_info,
9292
absl::optional<Envoy::Http::Protocol> protocol) override;
9393

9494
static Envoy::StreamInfo::ResponseFlag

0 commit comments

Comments
 (0)