update envoy f95f5391

library/common/extensions/filters/http/platform_bridge/c_type_definitions.h

@@ -7,9 +7,6 @@ const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusContinue =
     static_cast<envoy_filter_headers_status_t>(Envoy::Http::FilterHeadersStatus::Continue);
 const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusStopIteration =
     static_cast<envoy_filter_headers_status_t>(Envoy::Http::FilterHeadersStatus::StopIteration);
-const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusContinueAndEndStream =
-    static_cast<envoy_filter_headers_status_t>(
-        Envoy::Http::FilterHeadersStatus::ContinueAndEndStream);
 const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusStopAllIterationAndBuffer =
     static_cast<envoy_filter_headers_status_t>(
         Envoy::Http::FilterHeadersStatus::StopAllIterationAndBuffer);

library/common/extensions/filters/http/platform_bridge/c_types.h

@@ -20,7 +20,6 @@ extern const envoy_headers envoy_unaltered_headers;
 typedef int envoy_filter_headers_status_t;
 extern const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusContinue;
 extern const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusStopIteration;
-extern const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusContinueAndEndStream;
 extern const envoy_filter_headers_status_t kEnvoyFilterHeadersStatusStopAllIterationAndBuffer;
 // Note this return status is unique to platform filters and used only to resume iteration after
 // it has been previously stopped.

library/common/http/dispatcher.cc

@@ -51,7 +51,7 @@ void Dispatcher::DirectStreamCallbacks::encodeHeaders(const ResponseHeaderMap& h
 
   // Error path: missing EnvoyUpstreamServiceTime implies this is a local reply, which we treat as
   // a stream error.
-  if (!success_ && headers.get(Headers::get().EnvoyUpstreamServiceTime) == nullptr) {
+  if (!success_ && headers.get(Headers::get().EnvoyUpstreamServiceTime).empty()) {
     ENVOY_LOG(debug, "[S{}] intercepted local response", direct_stream_.stream_handle_);
     mapLocalResponseToError(headers);
     if (end_stream) {
@@ -427,13 +427,14 @@ void Dispatcher::setDestinationCluster(HeaderMap& headers) {
   // TODO(junr03): once http3 is available this would probably benefit from some sort of struct that
   // maps to appropriate cluster names. However, with only two options (http1/2) this suffices.
   bool use_h2_cluster{};
-  const HeaderEntry* entry = headers.get(H2UpstreamHeader);
-  if (entry) {
-    if (entry->value() == "http2") {
+  auto get_result = headers.get(H2UpstreamHeader);
+  if (!get_result.empty()) {
+    ASSERT(get_result.size() == 1);
+    const auto value = get_result[0]->value().getStringView();
+    if (value == "http2") {
       use_h2_cluster = true;
     } else {
-      ASSERT(entry->value() == "http1",
-             fmt::format("using unsupported protocol version {}", entry->value().getStringView()));
+      ASSERT(value == "http1", fmt::format("using unsupported protocol version {}", value));
     }
     headers.remove(H2UpstreamHeader);
   }

library/objective-c/EnvoyEngine.h

@@ -60,7 +60,6 @@ typedef NSDictionary<NSString *, NSArray<NSString *> *> EnvoyHeaders;
 /// Return codes for on-headers filter invocations. @see envoy/http/filter.h
 extern const int kEnvoyFilterHeadersStatusContinue;
 extern const int kEnvoyFilterHeadersStatusStopIteration;
-extern const int kEnvoyFilterHeadersStatusContinueAndEndStream;
 extern const int kEnvoyFilterHeadersStatusStopAllIterationAndBuffer;
 
 /// Return codes for on-data filter invocations. @see envoy/http/filter.h

tools/check_format.sh

@@ -11,7 +11,7 @@ fi
 # TODO(mattklein123): WORKSPACE is excluded due to warning about @bazel_tools reference. Fix here
 #                     or in the upstream checker.
 ENVOY_BAZEL_PREFIX=@envoy envoy/tools/code_format/check_format.py \
-    --add-excluded-prefixes ./envoy/ ./envoy_build_config/extensions_build_config.bzl ./WORKSPACE ./dist/Envoy.framework/ ./library/common/config_template.cc \
+    --add-excluded-prefixes ./envoy/ ./envoy_build_config/extensions_build_config.bzl ./WORKSPACE ./dist/Envoy.framework/ ./library/common/config_template.cc ./bazel/envoy_mobile_swift_bazel_support.bzl ./bazel/envoy_mobile_repositories.bzl \
     --skip_envoy_build_rule_check "$ENVOY_FORMAT_ACTION" \
     --namespace_check_excluded_paths ./examples/ ./library/java/ ./library/kotlin ./library/objective-c \
     --build_fixer_check_excluded_paths ./BUILD ./dist ./examples ./library/java ./library/kotlin ./library/objective-c ./library/swift ./library/common/extensions