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

Merge branch 'master' into http-parser-unknown-method

This commit is contained in:
Tatsuhiro Tsujikawa 2016-05-28 19:51:05 +09:00
parent f38babe30f 43b045e84c
commit f90f40e3b5
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shrpx_http2_downstream_connection.cc
View File

@ -310,13 +310,6 @@ int Http2DownstreamConnection::push_request_headers() {
http2::copy_headers_to_nva_nocopy(nva, req.fs.headers()); http2::copy_headers_to_nva_nocopy(nva, req.fs.headers());
bool chunked_encoding = false;
auto transfer_encoding = req.fs.header(http2::HD_TRANSFER_ENCODING);
if (transfer_encoding &&
util::strieq_l("chunked", (*transfer_encoding).value)) {
chunked_encoding = true;
}
if (!http2conf.no_cookie_crumbling) { if (!http2conf.no_cookie_crumbling) {
downstream_->crumble_request_cookie(nva); downstream_->crumble_request_cookie(nva);
} }
@ -425,6 +418,8 @@ int Http2DownstreamConnection::push_request_headers() {
DCLOG(INFO, this) << "HTTP request headers\n" << ss.str(); DCLOG(INFO, this) << "HTTP request headers\n" << ss.str();
} }
auto transfer_encoding = req.fs.header(http2::HD_TRANSFER_ENCODING);
// Add body as long as transfer-encoding is given even if // Add body as long as transfer-encoding is given even if
// req.fs.content_length == 0 to forward trailer fields. // req.fs.content_length == 0 to forward trailer fields.
if (req.method_token == HTTP_CONNECT || transfer_encoding || if (req.method_token == HTTP_CONNECT || transfer_encoding ||