diff --git a/WORKSPACE b/WORKSPACE index 61b788691b2..0cc27fae06b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,7 +30,7 @@ bind( ) # When updating envoy sha manually please update the sha in istio.deps file also -ENVOY_SHA = "4ef8562b2194f222ce8a3d733fb04c629eaf0667" +ENVOY_SHA = "74de08a0d4d31bd466639d25d681df5d290bb770" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index 4747323d5b8..654d778d445 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "4ef8562b2194f222ce8a3d733fb04c629eaf0667" + "lastStableSHA": "74de08a0d4d31bd466639d25d681df5d290bb770" } ] diff --git a/src/envoy/http/authn/http_filter.cc b/src/envoy/http/authn/http_filter.cc index 7889e81212c..717711a9edc 100644 --- a/src/envoy/http/authn/http_filter.cc +++ b/src/envoy/http/authn/http_filter.cc @@ -108,8 +108,8 @@ void AuthenticationFilter::rejectRequest(const std::string& message) { return; } state_ = State::REJECTED; - decoder_callbacks_->sendLocalReply(Http::Code::Unauthorized, message, - nullptr); + decoder_callbacks_->sendLocalReply(Http::Code::Unauthorized, message, nullptr, + absl::nullopt); } std::unique_ptr diff --git a/src/envoy/http/jwt_auth/http_filter.cc b/src/envoy/http/jwt_auth/http_filter.cc index 783693ec8d2..c882a558cb3 100644 --- a/src/envoy/http/jwt_auth/http_filter.cc +++ b/src/envoy/http/jwt_auth/http_filter.cc @@ -63,7 +63,7 @@ void JwtVerificationFilter::onDone(const JwtAuth::Status& status) { Code code = Code(401); // Unauthorized // return failure reason as message body decoder_callbacks_->sendLocalReply(code, JwtAuth::StatusToString(status), - nullptr); + nullptr, absl::nullopt); return; } diff --git a/src/envoy/http/mixer/filter.cc b/src/envoy/http/mixer/filter.cc index 68822e082f9..f06b99062f1 100644 --- a/src/envoy/http/mixer/filter.cc +++ b/src/envoy/http/mixer/filter.cc @@ -159,7 +159,7 @@ void Filter::completeCheck(const CheckResponseInfo& info) { state_ = Responded; int status_code = ::istio::utils::StatusHttpCode(status.error_code()); decoder_callbacks_->sendLocalReply(Code(status_code), status.ToString(), - nullptr); + nullptr, absl::nullopt); decoder_callbacks_->streamInfo().setResponseFlag( StreamInfo::ResponseFlag::UnauthorizedExternalService); return; @@ -174,9 +174,11 @@ void Filter::completeCheck(const CheckResponseInfo& info) { state_ = Responded; decoder_callbacks_->sendLocalReply( Code(route_directive_.direct_response_code()), - route_directive_.direct_response_body(), [this](HeaderMap& headers) { + route_directive_.direct_response_body(), + [this](HeaderMap& headers) { UpdateHeaders(headers, route_directive_.response_header_operations()); - }); + }, + absl::nullopt); return; }