From ccef299a525c76a648cb4b8be20557044fc5327b Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Thu, 1 Oct 2020 10:39:35 -0700 Subject: [PATCH] upstream: update with apple dns resolver (#1123) Updating to pull in https://github.com/envoyproxy/envoy/pull/13074 which will use Apple's DNS resolver for iOS in order to allow Envoy Mobile to ship on iOS 14 without triggering the "local area network" modal. Signed-off-by: Michael Rebello Signed-off-by: JP Simard --- mobile/bazel/envoy_mobile_repositories.bzl | 8 ++++---- mobile/envoy | 2 +- .../extensions/filters/http/platform_bridge/filter.proto | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mobile/bazel/envoy_mobile_repositories.bzl b/mobile/bazel/envoy_mobile_repositories.bzl index 63e2e1a03561..f5f1a50abae2 100644 --- a/mobile/bazel/envoy_mobile_repositories.bzl +++ b/mobile/bazel/envoy_mobile_repositories.bzl @@ -48,10 +48,10 @@ def upstream_envoy_overrides(): http_archive( name = "com_google_absl", patches = ["@envoy_mobile//bazel:abseil.patch"], - sha256 = "14ee08e2089c2a9b6bf27e1d10abc5629c69c4d0bab4b78ec5b65a29ea1c2af7", - strip_prefix = "abseil-cpp-cf3a1998e9d41709d4141e2f13375993cba1130e", - # 2020-03-05 - urls = ["https://github.com/abseil/abseil-cpp/archive/cf3a1998e9d41709d4141e2f13375993cba1130e.tar.gz"], + sha256 = "573baccd67aa591b8c7209bfb0c77e0d15633d77ced39d1ccbb1232828f7f7d9", + strip_prefix = "abseil-cpp-ce4bc927755fdf0ed03d679d9c7fa041175bb3cb", + # 2020-08-08 + urls = ["https://github.com/abseil/abseil-cpp/archive/ce4bc927755fdf0ed03d679d9c7fa041175bb3cb.tar.gz"], ) # This should be kept in sync with Envoy itself, we just need to apply this patch diff --git a/mobile/envoy b/mobile/envoy index 5d9abfe28d87..ed1ee215dff9 160000 --- a/mobile/envoy +++ b/mobile/envoy @@ -1 +1 @@ -Subproject commit 5d9abfe28d87d3fd1e2038039b77531cf28476b8 +Subproject commit ed1ee215dff93c50d5d4770cb1f6dc7e419f6c3d diff --git a/mobile/library/common/extensions/filters/http/platform_bridge/filter.proto b/mobile/library/common/extensions/filters/http/platform_bridge/filter.proto index 70587e804169..7de5cde3ef3c 100644 --- a/mobile/library/common/extensions/filters/http/platform_bridge/filter.proto +++ b/mobile/library/common/extensions/filters/http/platform_bridge/filter.proto @@ -5,5 +5,5 @@ package envoymobile.extensions.filters.http.platform_bridge; import "validate/validate.proto"; message PlatformBridge { - string platform_filter_name = 1 [(validate.rules).string.min_bytes = 1]; + string platform_filter_name = 1 [(validate.rules).string.min_len = 1]; }