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

nghttpd: Avoid sending last 0-sized DATA

This commit is contained in:
Tatsuhiro Tsujikawa 2014-12-24 00:31:21 +09:00
parent 55e550f08f
commit 292f219900
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/HttpServer.cc
View File

@ -110,8 +110,8 @@ Config::Config()
Config::~Config() { nghttp2_option_del(session_option); } Config::~Config() { nghttp2_option_del(session_option); }
Stream::Stream(Http2Handler *handler, int32_t stream_id) Stream::Stream(Http2Handler *handler, int32_t stream_id)
: handler(handler), rtimer(nullptr), wtimer(nullptr), stream_id(stream_id), : handler(handler), rtimer(nullptr), wtimer(nullptr), body_left(0),
file(-1) {} stream_id(stream_id), file(-1) {}
Stream::~Stream() { Stream::~Stream() {
if (file != -1) { if (file != -1) {
@ -692,7 +692,8 @@ ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE; return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
} }
if (nread == 0) { stream->body_left -= nread;
if (nread == 0 || stream->body_left <= 0) {
*data_flags |= NGHTTP2_DATA_FLAG_EOF; *data_flags |= NGHTTP2_DATA_FLAG_EOF;
if (nghttp2_session_get_stream_remote_close(session, stream_id) == 0) { if (nghttp2_session_get_stream_remote_close(session, stream_id) == 0) {
@ -747,6 +748,7 @@ void prepare_status_response(Stream *stream, Http2Handler *hd,
close(pipefd[1]); close(pipefd[1]);
stream->file = pipefd[0]; stream->file = pipefd[0];
stream->body_left = body.size();
nghttp2_data_provider data_prd; nghttp2_data_provider data_prd;
data_prd.source.fd = pipefd[0]; data_prd.source.fd = pipefd[0];
data_prd.read_callback = file_read_callback; data_prd.read_callback = file_read_callback;
@ -856,6 +858,7 @@ void prepare_response(Stream *stream, Http2Handler *hd,
} }
stream->file = file; stream->file = file;
stream->body_left = buf.st_size;
nghttp2_data_provider data_prd; nghttp2_data_provider data_prd;

1
src/HttpServer.h
View File

@ -90,6 +90,7 @@ struct Stream {
Http2Handler *handler; Http2Handler *handler;
event *rtimer; event *rtimer;
event *wtimer; event *wtimer;
int64_t body_left;
int32_t stream_id; int32_t stream_id;
int file; int file;
Stream(Http2Handler *handler, int32_t stream_id); Stream(Http2Handler *handler, int32_t stream_id);