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

nghttpx: It is enough to check "chunked" in the suffix

This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-17 16:34:56 +09:00
parent e255468bdf
commit 919e9eee63
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shrpx_downstream.cc
View File

@ -662,7 +662,7 @@ void Downstream::inspect_http1_request() {
auto transfer_encoding = req_.fs.header(http2::HD_TRANSFER_ENCODING); auto transfer_encoding = req_.fs.header(http2::HD_TRANSFER_ENCODING);
if (transfer_encoding) { if (transfer_encoding) {
req_.fs.content_length = -1; req_.fs.content_length = -1;
if (util::strifind(transfer_encoding->value.c_str(), "chunked")) { if (util::iends_with_l(transfer_encoding->value, "chunked")) {
chunked_request_ = true; chunked_request_ = true;
} }
} }
@ -672,7 +672,7 @@ void Downstream::inspect_http1_response() {
auto transfer_encoding = resp_.fs.header(http2::HD_TRANSFER_ENCODING); auto transfer_encoding = resp_.fs.header(http2::HD_TRANSFER_ENCODING);
if (transfer_encoding) { if (transfer_encoding) {
resp_.fs.content_length = -1; resp_.fs.content_length = -1;
if (util::strifind(transfer_encoding->value.c_str(), "chunked")) { if (util::iends_with_l(transfer_encoding->value, "chunked")) {
chunked_response_ = true; chunked_response_ = true;
} }
} }

4
src/util.h
View File

@ -238,6 +238,10 @@ inline bool iends_with(const std::string &a, const std::string &b) {
return iends_with(std::begin(a), std::end(a), std::begin(b), std::end(b)); return iends_with(std::begin(a), std::end(a), std::begin(b), std::end(b));
} }
template <size_t N> bool iends_with_l(const std::string &a, const char(&b)[N]) {
return iends_with(std::begin(a), std::end(a), b, b + N - 1);
}
int strcompare(const char *a, const uint8_t *b, size_t n); int strcompare(const char *a, const uint8_t *b, size_t n);
template <typename InputIt> bool strieq(const char *a, InputIt b, size_t bn) { template <typename InputIt> bool strieq(const char *a, InputIt b, size_t bn) {

3
src/util_test.cc
View File

@ -374,6 +374,9 @@ void test_util_ends_with(void) {
CU_ASSERT(util::iends_with("foo", "")); CU_ASSERT(util::iends_with("foo", ""));
CU_ASSERT(util::iends_with("oFoo", "fOO")); CU_ASSERT(util::iends_with("oFoo", "fOO"));
CU_ASSERT(!util::iends_with("ofoo", "fo")); CU_ASSERT(!util::iends_with("ofoo", "fo"));
CU_ASSERT(util::iends_with_l("oFoo", "fOO"));
CU_ASSERT(!util::iends_with_l("ofoo", "fo"));
} }
void test_util_parse_http_date(void) { void test_util_parse_http_date(void) {