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

Don't send Transfer-Encoding to pre-HTTP/1.1 clients

This commit is contained in:
Tatsuhiro Tsujikawa 2018-10-14 22:57:54 +09:00
parent 5e925f873e
commit 46576178a3
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http2.cc
View File

@ -503,6 +503,11 @@ void build_http1_headers_from_headers(DefaultMemchunks *buf,
continue; continue;
} }
break; break;
case HD_TRANSFER_ENCODING:
if (flags & HDOP_STRIP_TRANSFER_ENCODING) {
continue;
}
break;
case HD_FORWARDED: case HD_FORWARDED:
if (flags & HDOP_STRIP_FORWARDED) { if (flags & HDOP_STRIP_FORWARDED) {
continue; continue;
@ -1874,6 +1879,10 @@ StringRef make_websocket_accept_token(uint8_t *dest, const StringRef &key) {
return StringRef{dest, end}; return StringRef{dest, end};
} }
bool legacy_http1(int major, int minor) {
return major <= 0 || (major == 1 && minor == 0);
}
} // namespace http2 } // namespace http2
} // namespace nghttp2 } // namespace nghttp2

7
src/http2.h
View File

@ -217,6 +217,9 @@ enum HeaderBuildOp {
// Sec-WebSocket-Key header field must be stripped. If this flag is // Sec-WebSocket-Key header field must be stripped. If this flag is
// not set, all Sec-WebSocket-Key header fields are added. // not set, all Sec-WebSocket-Key header fields are added.
HDOP_STRIP_SEC_WEBSOCKET_KEY = 1 << 6, HDOP_STRIP_SEC_WEBSOCKET_KEY = 1 << 6,
// Transfer-Encoding header field must be stripped. If this flag is
// not set, all Transfer-Encoding header fields are added.
HDOP_STRIP_TRANSFER_ENCODING = 1 << 7,
}; };
// Appends headers in |headers| to |nv|. |headers| must be indexed // Appends headers in |headers| to |nv|. |headers| must be indexed
@ -437,6 +440,10 @@ bool contains_trailers(const StringRef &s);
// of error. // of error.
StringRef make_websocket_accept_token(uint8_t *dest, const StringRef &key); StringRef make_websocket_accept_token(uint8_t *dest, const StringRef &key);
// Returns true if HTTP version represents pre-HTTP/1.1 (e.g.,
// HTTP/0.9 or HTTP/1.0).
bool legacy_http1(int major, int minor);
} // namespace http2 } // namespace http2
} // namespace nghttp2 } // namespace nghttp2

5
src/shrpx_http_downstream_connection.cc
View File

@ -1000,6 +1000,11 @@ int htp_hdrs_completecb(http_parser *htp) {
resp.connection_close = true; resp.connection_close = true;
// transfer-encoding not applied to upgraded connection // transfer-encoding not applied to upgraded connection
downstream->set_chunked_response(false); downstream->set_chunked_response(false);
} else if (http2::legacy_http1(req.http_major, req.http_minor)) {
if (resp.fs.content_length == -1) {
resp.connection_close = true;
}
downstream->set_chunked_response(false);
} else if (!downstream->expect_response_body()) { } else if (!downstream->expect_response_body()) {
downstream->set_chunked_response(false); downstream->set_chunked_response(false);
} }

8
src/shrpx_https_upstream.cc
View File

@ -1122,8 +1122,12 @@ int HttpsUpstream::on_downstream_header_complete(Downstream *downstream) {
return 0; return 0;
} }
http2::build_http1_headers_from_headers( auto build_flags = (http2::HDOP_STRIP_ALL & ~http2::HDOP_STRIP_VIA) |
buf, resp.fs.headers(), http2::HDOP_STRIP_ALL & ~http2::HDOP_STRIP_VIA); (!http2::legacy_http1(req.http_major, req.http_minor)
? 0
: http2::HDOP_STRIP_TRANSFER_ENCODING);
http2::build_http1_headers_from_headers(buf, resp.fs.headers(), build_flags);
auto worker = handler_->get_worker(); auto worker = handler_->get_worker();