diff --git a/source/common/http/header_utility.cc b/source/common/http/header_utility.cc index 527bd05f52af1..e504a21ad8a23 100644 --- a/source/common/http/header_utility.cc +++ b/source/common/http/header_utility.cc @@ -210,17 +210,6 @@ bool HeaderUtility::requestShouldHaveNoBody(const RequestHeaderMap& headers) { headers.Method()->value() == Http::Headers::get().MethodValues.Connect)); } -void HeaderUtility::addHeaders(HeaderMap& headers, const HeaderMap& headers_to_add) { - headers_to_add.iterate([&headers](const HeaderEntry& header) -> HeaderMap::Iterate { - HeaderString k; - k.setCopy(header.key().getStringView()); - HeaderString v; - v.setCopy(header.value().getStringView()); - headers.addViaMove(std::move(k), std::move(v)); - return HeaderMap::Iterate::Continue; - }); -} - bool HeaderUtility::isEnvoyInternalRequest(const RequestHeaderMap& headers) { const HeaderEntry* internal_request_header = headers.EnvoyInternalRequest(); return internal_request_header != nullptr && diff --git a/source/common/http/header_utility.h b/source/common/http/header_utility.h index e84f38ed5347b..20719003733c2 100644 --- a/source/common/http/header_utility.h +++ b/source/common/http/header_utility.h @@ -153,13 +153,6 @@ class HeaderUtility { static bool requestShouldHaveNoBody(const RequestHeaderMap& headers); - /** - * Add headers from one HeaderMap to another - * @param headers target where headers will be added - * @param headers_to_add supplies the headers to be added - */ - static void addHeaders(HeaderMap& headers, const HeaderMap& headers_to_add); - /** * @brief a helper function to determine if the headers represent an envoy internal request */ diff --git a/source/extensions/filters/http/ratelimit/ratelimit.cc b/source/extensions/filters/http/ratelimit/ratelimit.cc index 07c11b088e2d0..d97b6ea489cbb 100644 --- a/source/extensions/filters/http/ratelimit/ratelimit.cc +++ b/source/extensions/filters/http/ratelimit/ratelimit.cc @@ -193,7 +193,7 @@ void Filter::complete(Filters::Common::RateLimit::LimitStatus status, if (response_headers_to_add_ == nullptr) { response_headers_to_add_ = Http::ResponseHeaderMapImpl::create(); } - Http::HeaderUtility::addHeaders(*response_headers_to_add_, *rate_limit_headers); + Http::HeaderMapImpl::copyFrom(*response_headers_to_add_, *rate_limit_headers); } else { descriptor_statuses = nullptr; } @@ -255,14 +255,14 @@ void Filter::populateResponseHeaders(Http::HeaderMap& response_headers, bool fro if (from_local_reply && !response_headers_to_add_->getContentTypeValue().empty()) { response_headers.remove(Http::Headers::get().ContentType); } - Http::HeaderUtility::addHeaders(response_headers, *response_headers_to_add_); + Http::HeaderMapImpl::copyFrom(response_headers, *response_headers_to_add_); response_headers_to_add_ = nullptr; } } void Filter::appendRequestHeaders(Http::HeaderMapPtr& request_headers_to_add) { if (request_headers_to_add && request_headers_) { - Http::HeaderUtility::addHeaders(*request_headers_, *request_headers_to_add); + Http::HeaderMapImpl::copyFrom(*request_headers_, *request_headers_to_add); request_headers_to_add = nullptr; } } diff --git a/test/common/http/header_utility_test.cc b/test/common/http/header_utility_test.cc index 7664aaee4c80a..a529f7011b010 100644 --- a/test/common/http/header_utility_test.cc +++ b/test/common/http/header_utility_test.cc @@ -687,7 +687,7 @@ TEST(HeaderAddTest, HeaderAdd) { TestRequestHeaderMapImpl headers{{"myheader1", "123value"}}; TestRequestHeaderMapImpl headers_to_add{{"myheader2", "456value"}}; - HeaderUtility::addHeaders(headers, headers_to_add); + HeaderMapImpl::copyFrom(headers, headers_to_add); headers_to_add.iterate([&headers](const Http::HeaderEntry& entry) -> Http::HeaderMap::Iterate { Http::LowerCaseString lower_key{std::string(entry.key().getStringView())};