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

nghttpx: Do not limit DATA frame length

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-07 01:25:43 +09:00
parent 8bfd900be5
commit 90914b38f1
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shrpx_http2_upstream.cc
View File

@ -961,19 +961,8 @@ ssize_t downstream_data_read_callback(nghttp2_session *session,
auto downstream = static_cast<Downstream *>(source->ptr); auto downstream = static_cast<Downstream *>(source->ptr);
auto upstream = static_cast<Http2Upstream *>(downstream->get_upstream()); auto upstream = static_cast<Http2Upstream *>(downstream->get_upstream());
auto body = downstream->get_response_buf(); auto body = downstream->get_response_buf();
auto handler = upstream->get_client_handler();
assert(body); 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));
}
auto nread = body->remove(buf, length); auto nread = body->remove(buf, length);
auto body_empty = body->rleft() == 0; auto body_empty = body->rleft() == 0;

11
src/shrpx_spdy_upstream.cc
View File

@ -680,19 +680,8 @@ ssize_t spdy_data_read_callback(spdylay_session *session, int32_t stream_id,
auto downstream = static_cast<Downstream *>(source->ptr); auto downstream = static_cast<Downstream *>(source->ptr);
auto upstream = static_cast<SpdyUpstream *>(downstream->get_upstream()); auto upstream = static_cast<SpdyUpstream *>(downstream->get_upstream());
auto body = downstream->get_response_buf(); auto body = downstream->get_response_buf();
auto handler = upstream->get_client_handler();
assert(body); 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));
}
auto nread = body->remove(buf, length); auto nread = body->remove(buf, length);
auto body_empty = body->rleft() == 0; auto body_empty = body->rleft() == 0;