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

nghttpx: Apply TLS record length limit to DATA frame payload 

This is not obvious but it makes intermediaries flush and forward DATA
frame boundary without excessive buffering.  Since we have different
TCP connections frontend and backend, this may not work.  This is
still experimental.
This commit is contained in:
Tatsuhiro Tsujikawa 2014-11-06 21:14:14 +09:00
parent f8c70993c0
commit 154876a17b
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shrpx_http2_upstream.cc
View File

@ -1080,8 +1080,19 @@ ssize_t downstream_data_read_callback(nghttp2_session *session,
auto downstream = static_cast<Downstream*>(source->ptr);
auto upstream = static_cast<Http2Upstream*>(downstream->get_upstream());
auto body = downstream->get_response_body_buf();
auto handler = upstream->get_client_handler();
assert(body);
auto limit = handler->get_write_limit();
if(limit != -1) {
// 9 is HTTP/2 frame header length. Make DATA frame also under
// certain limit, so that application layer can flush at DATA
// frame boundary, instead of buffering large frame.
assert(limit > 9);
length = std::min(length, static_cast<size_t>(limit - 9));
}
int nread = evbuffer_remove(body, buf, length);
if(nread == -1) {
ULOG(FATAL, upstream) << "evbuffer_remove() failed";

12
src/shrpx_spdy_upstream.cc
View File

@ -799,7 +799,19 @@ ssize_t spdy_data_read_callback(spdylay_session *session,
auto downstream = static_cast<Downstream*>(source->ptr);
auto upstream = static_cast<SpdyUpstream*>(downstream->get_upstream());
auto body = downstream->get_response_body_buf();
auto handler = upstream->get_client_handler();
assert(body);
auto limit = handler->get_write_limit();
if(limit != -1) {
// 9 is HTTP/2 frame header length. Make DATA frame also under
// certain limit, so that application layer can flush at DATA
// frame boundary, instead of buffering large frame.
assert(limit > 9);
length = std::min(length, static_cast<size_t>(limit - 9));
}
int nread = evbuffer_remove(body, buf, length);
if(nread == -1) {
ULOG(FATAL, upstream) << "evbuffer_remove() failed";