Skip to content

Commit 30e52a3

Browse files
authored
Update Envoy to 84b6682 (May 23, 2022) (#856)
- Envoy's `.bazelrc` reordered the tools paths on macOS - `Envoy::Http::Http1::ActiveClient` 1-arg constructor was removed; migrated to the 2-arg constructor with the second arg `absl::nullopt` Signed-off-by: eric846 <56563761+eric846@users.noreply.github.com>
1 parent 4919c54 commit 30e52a3

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ build:clang-asan --linkopt --unwindlib=libgcc
106106

107107
# macOS
108108
build:macos --cxxopt=-std=c++17
109-
build:macos --action_env=PATH=/usr/bin:/bin:/opt/homebrew/bin:/usr/local/bin:/opt/local/bin
110-
build:macos --host_action_env=PATH=/usr/bin:/bin:/opt/homebrew/bin:/usr/local/bin:/opt/local/bin
109+
build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
110+
build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
111111
build:macos --define tcmalloc=disabled
112112
build:macos --define wasm=disabled
113113

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 = "f1a3fd1c549e86a02aa222784bcef9bf63dca19d"
4-
ENVOY_SHA = "092e7243de4cd49e1ac9de611996a9dcc9fa2f398ef5e3f92fc90269abfcbfab"
3+
ENVOY_COMMIT = "84b66829bdda86c719047ccc3c0a4fc2f2e2c328"
4+
ENVOY_SHA = "37061191b50281149a58a7234b2640e98651038d4cad9a81b94a4c98864207ba"
55

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

source/client/process_impl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ class ClusterManagerFactory : public Envoy::Upstream::ProdClusterManagerFactory
191191
host, priority, dispatcher, options, transport_socket_options,
192192
context_.api().randomGenerator(), state,
193193
[](Envoy::Http::HttpConnPoolImplBase* pool) {
194-
return std::make_unique<Envoy::Http::Http1::ActiveClient>(*pool);
194+
return std::make_unique<Envoy::Http::Http1::ActiveClient>(*pool, absl::nullopt);
195195
},
196196
[](Envoy::Upstream::Host::CreateConnectionData& data,
197197
Envoy::Http::HttpConnPoolImplBase* pool) {

0 commit comments

Comments
 (0)