From 3b270cb73dda61b12545accc80395a3d9768aa5e Mon Sep 17 00:00:00 2001
From: Takeshi Yoneda <takeshi@tetrate.io>
Date: Wed, 11 Nov 2020 16:34:35 +0900
Subject: [PATCH] wasm: Force stop iteration after local response is sent
 (#13930)

Resolves https://github.com/envoyproxy/envoy/issues/13857

ref:
-https://github.com/proxy-wasm/proxy-wasm-rust-sdk/issues/44
-https://github.com/proxy-wasm/proxy-wasm-cpp-host/pull/88
-https://github.com/proxy-wasm/proxy-wasm-cpp-host/pull/93

Signed-off-by: mathetake <takeshi@tetrate.io>
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 bazel/repository_locations.bzl                        | 6 +++---
 test/extensions/filters/http/wasm/wasm_filter_test.cc | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
index cfca022a6c43..ec5a90cdfeb0 100644
--- a/bazel/repository_locations.bzl
+++ b/bazel/repository_locations.bzl
@@ -869,8 +869,8 @@ DEPENDENCY_REPOSITORIES_SPEC = dict(
         project_name = "WebAssembly for Proxies (C++ host implementation)",
         project_desc = "WebAssembly for Proxies (C++ host implementation)",
         project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
-        version = "40fd3d03842c07d65fed907a6b6ed0f89d68d531",
-        sha256 = "b5ae746e66b6209ea0cce86d6c21de99dacbec1da9cdadd53a9ec46bc296a3ba",
+        version = "b7d3d13d75bb6b50f192252258bb9583bf723fa4",
+        sha256 = "ae639f94a80adbe915849bccb32346720c59a579db09918e44aefafed6cbb100",
         strip_prefix = "proxy-wasm-cpp-host-{version}",
         urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
         use_category = ["dataplane_ext"],
@@ -881,7 +881,7 @@ DEPENDENCY_REPOSITORIES_SPEC = dict(
             "envoy.filters.network.wasm",
             "envoy.stat_sinks.wasm",
         ],
-        last_updated = "2020-10-27",
+        last_updated = "2020-11-10",
         cpe = "N/A",
     ),
     # TODO: upgrade to the latest version (1.41 currently fails tests)
diff --git a/test/extensions/filters/http/wasm/wasm_filter_test.cc b/test/extensions/filters/http/wasm/wasm_filter_test.cc
index 538481f36f6c..ea010b9ae71d 100644
--- a/test/extensions/filters/http/wasm/wasm_filter_test.cc
+++ b/test/extensions/filters/http/wasm/wasm_filter_test.cc
@@ -1436,7 +1436,8 @@ TEST_P(WasmHttpFilterTest, RootId2) {
   setupFilter("context2");
   EXPECT_CALL(filter(), log_(spdlog::level::debug, Eq(absl::string_view("onRequestHeaders2 2"))));
   Http::TestRequestHeaderMapImpl request_headers;
-  EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter().decodeHeaders(request_headers, true));
+  EXPECT_EQ(Http::FilterHeadersStatus::StopAllIterationAndWatermark,
+            filter().decodeHeaders(request_headers, true));
 }
 
 } // namespace Wasm