walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Simplify add_header

This commit is contained in:
Tatsuhiro Tsujikawa 2015-10-28 02:57:31 +09:00
parent b051ddec2a
commit 1aa8e8cd9f
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/shrpx_downstream.cc
View File

@ -318,6 +318,18 @@ void add_header(bool &key_prev, size_t &sum, Headers &headers, std::string name,
} }
} // namespace } // namespace
namespace {
void add_header(size_t &sum, Headers &headers, const uint8_t *name,
size_t namelen, const uint8_t *value, size_t valuelen,
bool no_index, int16_t token) {
sum += namelen + valuelen;
headers.emplace_back(
std::string(reinterpret_cast<const char *>(name), namelen),
std::string(reinterpret_cast<const char *>(value), valuelen), no_index,
token);
}
} // namespace
namespace { namespace {
void append_last_header_key(bool key_prev, size_t &sum, Headers &headers, void append_last_header_key(bool key_prev, size_t &sum, Headers &headers,
const char *data, size_t len) { const char *data, size_t len) {
@ -418,9 +430,8 @@ void Downstream::add_request_header(const uint8_t *name, size_t namelen,
const uint8_t *value, size_t valuelen, const uint8_t *value, size_t valuelen,
bool no_index, int16_t token) { bool no_index, int16_t token) {
http2::index_header(request_hdidx_, token, request_headers_.size()); http2::index_header(request_hdidx_, token, request_headers_.size());
request_headers_sum_ += namelen + valuelen; add_header(request_headers_sum_, request_headers_, name, namelen, value,
http2::add_header(request_headers_, name, namelen, value, valuelen, no_index, valuelen, no_index, token);
token);
} }
bool Downstream::get_request_header_key_prev() const { bool Downstream::get_request_header_key_prev() const {
@ -452,9 +463,8 @@ void Downstream::add_request_trailer(const uint8_t *name, size_t namelen,
bool no_index, int16_t token) { bool no_index, int16_t token) {
// we never index trailer part. Header size limit should be applied // we never index trailer part. Header size limit should be applied
// to all request header fields combined. // to all request header fields combined.
request_headers_sum_ += namelen + valuelen; add_header(request_headers_sum_, request_trailers_, name, namelen, value,
http2::add_header(request_trailers_, name, namelen, value, valuelen, no_index, valuelen, no_index, -1);
-1);
} }
const Headers &Downstream::get_request_trailers() const { const Headers &Downstream::get_request_trailers() const {
@ -722,9 +732,8 @@ void Downstream::add_response_header(const uint8_t *name, size_t namelen,
const uint8_t *value, size_t valuelen, const uint8_t *value, size_t valuelen,
bool no_index, int16_t token) { bool no_index, int16_t token) {
http2::index_header(response_hdidx_, token, response_headers_.size()); http2::index_header(response_hdidx_, token, response_headers_.size());
response_headers_sum_ += namelen + valuelen; add_header(response_headers_sum_, response_headers_, name, namelen, value,
http2::add_header(response_headers_, name, namelen, value, valuelen, no_index, valuelen, no_index, token);
token);
} }
bool Downstream::get_response_header_key_prev() const { bool Downstream::get_response_header_key_prev() const {
@ -758,9 +767,8 @@ const Headers &Downstream::get_response_trailers() const {
void Downstream::add_response_trailer(const uint8_t *name, size_t namelen, void Downstream::add_response_trailer(const uint8_t *name, size_t namelen,
const uint8_t *value, size_t valuelen, const uint8_t *value, size_t valuelen,
bool no_index, int16_t token) { bool no_index, int16_t token) {
response_headers_sum_ += namelen + valuelen; add_header(response_headers_sum_, response_trailers_, name, namelen, value,
http2::add_header(response_trailers_, name, namelen, value, valuelen, valuelen, no_index, -1);
no_index, -1);
} }
unsigned int Downstream::get_response_http_status() const { unsigned int Downstream::get_response_http_status() const {