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

nghttpx: Remove FieldStore::set_last_{header,trailer}_value 

Use FieldStore::append_last_{header,trailer}_value instead.
This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-13 23:01:29 +09:00
parent 919f08eb38
commit a7fd37ffdf
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shrpx_downstream.cc
View File

@ -360,7 +360,7 @@ void append_last_header_key(bool key_prev, size_t &sum, Headers &headers,
namespace { namespace {
void append_last_header_value(bool key_prev, size_t &sum, Headers &headers, void append_last_header_value(bool key_prev, size_t &sum, Headers &headers,
const char *data, size_t len) { const char *data, size_t len) {
assert(!key_prev); key_prev = false;
sum += len; sum += len;
auto &item = headers.back(); auto &item = headers.back();
item.value.append(data, len); item.value.append(data, len);
@ -455,11 +455,6 @@ void FieldStore::add_header(std::string name, std::string value) {
std::move(value)); std::move(value));
} }
void FieldStore::set_last_header_value(const char *data, size_t len) {
shrpx::set_last_header_value(header_key_prev_, buffer_size_, headers_, data,
len);
}
void FieldStore::add_header(std::string name, std::string value, void FieldStore::add_header(std::string name, std::string value,
int16_t token) { int16_t token) {
http2::index_header(hdidx_, token, headers_.size()); http2::index_header(hdidx_, token, headers_.size());
@ -504,11 +499,6 @@ void FieldStore::add_trailer(std::string name, std::string value) {
std::move(value)); std::move(value));
} }
void FieldStore::set_last_trailer_value(const char *data, size_t len) {
shrpx::set_last_header_value(trailer_key_prev_, buffer_size_, trailers_, data,
len);
}
void FieldStore::append_last_trailer_key(const char *data, size_t len) { void FieldStore::append_last_trailer_key(const char *data, size_t len) {
shrpx::append_last_header_key(trailer_key_prev_, buffer_size_, trailers_, shrpx::append_last_header_key(trailer_key_prev_, buffer_size_, trailers_,
data, len); data, len);

3
src/shrpx_downstream.h
View File

@ -84,7 +84,6 @@ public:
void append_last_header_key(const char *data, size_t len); void append_last_header_key(const char *data, size_t len);
void append_last_header_value(const char *data, size_t len); void append_last_header_value(const char *data, size_t len);
void set_last_header_value(const char *data, size_t len);
bool header_key_prev() const { return header_key_prev_; } bool header_key_prev() const { return header_key_prev_; }
@ -103,8 +102,6 @@ public:
void append_last_trailer_key(const char *data, size_t len); void append_last_trailer_key(const char *data, size_t len);
void append_last_trailer_value(const char *data, size_t len); void append_last_trailer_value(const char *data, size_t len);
void set_last_trailer_value(const char *data, size_t len);
bool trailer_key_prev() const { return trailer_key_prev_; } bool trailer_key_prev() const { return trailer_key_prev_; }
// content-length, -1 if it is unknown. // content-length, -1 if it is unknown.

8
src/shrpx_https_upstream.cc
View File

@ -179,18 +179,10 @@ int htp_hdr_valcb(http_parser *htp, const char *data, size_t len) {
return -1; return -1;
} }
if (downstream->get_request_state() == Downstream::INITIAL) { if (downstream->get_request_state() == Downstream::INITIAL) {
if (req.fs.header_key_prev()) {
req.fs.set_last_header_value(data, len);
} else {
req.fs.append_last_header_value(data, len); req.fs.append_last_header_value(data, len);
}
} else {
if (req.fs.trailer_key_prev()) {
req.fs.set_last_trailer_value(data, len);
} else { } else {
req.fs.append_last_trailer_value(data, len); req.fs.append_last_trailer_value(data, len);
} }
}
return 0; return 0;
} }
} // namespace } // namespace