Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 envoy
Submodule envoy updated 157 files
1 change: 1 addition & 0 deletions library/common/config/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ stats_sinks: *stats_sinks
envoy:
reloadable_features:
allow_multiple_dns_addresses: *dns_multiple_addresses
override_request_timeout_by_gateway_timeout: false
)"
// Needed due to warning in
// https://github.com/envoyproxy/envoy/blob/6eb7e642d33f5a55b63c367188f09819925fca34/source/server/server.cc#L546
Expand Down
2 changes: 1 addition & 1 deletion library/common/engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ envoy_status_t Engine::makeAdminCall(absl::string_view path, absl::string_view m
std::string body;
const auto code = server_->admin().request(path, method, *response_headers, body);
if (code != Http::Code::OK) {
ENVOY_LOG(warn, "admin call failed with status {} body {}", code, body);
ENVOY_LOG(warn, "admin call failed with status {} body {}", static_cast<uint64_t>(code), body);
return ENVOY_FAILURE;
}

Expand Down
3 changes: 2 additions & 1 deletion library/common/extensions/filters/http/local_error/filter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ namespace HttpFilters {
namespace LocalError {

Http::LocalErrorStatus LocalErrorFilter::onLocalReply(const LocalReplyData& reply) {
ENVOY_LOG(trace, "LocalErrorFilter::onLocalReply({}, {})", reply.code_, reply.details_);
ENVOY_LOG(trace, "LocalErrorFilter::onLocalReply({}, {})", static_cast<uint64_t>(reply.code_),
reply.details_);
ASSERT(decoder_callbacks_);
auto& info = decoder_callbacks_->streamInfo();
// TODO(goaway): set responseCode in upstream Envoy when responseCodDetails are set.
Expand Down
7 changes: 7 additions & 0 deletions test/swift/integration/IdleTimeoutTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ static_resources:
- endpoint:
address:
socket_address: { address: 127.0.0.1, port_value: \(remotePort) }
layered_runtime:
layers:
- name: static_layer_0
static_layer:
envoy:
reloadable_features:
override_request_timeout_by_gateway_timeout: false
"""

class IdleTimeoutValidationFilter: AsyncResponseFilter, ResponseFilter {
Expand Down