Skip to content

Update Envoy SHA to 74de08a0 #2026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 1 commit into from
Nov 7, 2018
Merged

Update Envoy SHA to 74de08a0 #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion istio.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "envoyproxy/envoy",
"file": "WORKSPACE",
"lastStableSHA": "4ef8562b2194f222ce8a3d733fb04c629eaf0667"
"lastStableSHA": "74de08a0d4d31bd466639d25d681df5d290bb770"
}
]
4 changes: 2 additions & 2 deletions src/envoy/http/authn/http_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Istio::AuthN::AuthenticatorBase>
Expand Down
2 changes: 1 addition & 1 deletion src/envoy/http/jwt_auth/http_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
8 changes: 5 additions & 3 deletions src/envoy/http/mixer/filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down