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

nghttpx: Fix possible deadlock due to exhaustion of send window

This commit is contained in:
Tatsuhiro Tsujikawa 2014-08-20 01:39:07 +09:00
parent c81e87bf37
commit 69b9ce6b68
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/shrpx_http2_downstream_connection.cc
View File

@ -204,6 +204,20 @@ ssize_t http2_data_read_callback(nghttp2_session *session,
return NGHTTP2_ERR_CALLBACK_FAILURE;
}
if(nread == 0) {
// This is important because it will handle flow control
// stuff.
if(downstream->get_upstream()->resume_read(SHRPX_NO_BUFFER,
downstream) != 0) {
// In this case, downstream may be deleted.
return NGHTTP2_ERR_CALLBACK_FAILURE;
}
// Check dconn is still alive because Upstream::resume_read()
// may delete downstream which will delete dconn.
if(sd->dconn == nullptr) {
return NGHTTP2_ERR_DEFERRED;
}
if(downstream->get_request_state() == Downstream::MSG_COMPLETE) {
if(!downstream->get_upgrade_request() ||
(downstream->get_response_state() == Downstream::HEADER_COMPLETE &&
@ -216,18 +230,6 @@ ssize_t http2_data_read_callback(nghttp2_session *session,
}
break;
} else {
// This is important because it will handle flow control
// stuff.
if(downstream->get_upstream()->resume_read(SHRPX_NO_BUFFER,
downstream) != 0) {
// In this case, downstream may be deleted.
return NGHTTP2_ERR_CALLBACK_FAILURE;
}
// Check dconn is still alive because Upstream::resume_read()
// may delete downstream which will delete dconn.
if(sd->dconn == nullptr) {
return NGHTTP2_ERR_DEFERRED;
}
if(evbuffer_get_length(body) == 0) {
// Check get_request_state() == MSG_COMPLETE just in case
if(downstream->get_request_state() == Downstream::MSG_COMPLETE) {

4
src/shrpx_http2_upstream.cc
View File

@ -1101,13 +1101,15 @@ ssize_t downstream_data_read_callback(nghttp2_session *session,
downstream->disable_upstream_wtimer();
}
if(nread == 0 && ((*data_flags) & NGHTTP2_DATA_FLAG_EOF) == 0) {
if(nread == 0) {
if(downstream->resume_read(SHRPX_NO_BUFFER) != 0) {
return NGHTTP2_ERR_CALLBACK_FAILURE;
}
if(((*data_flags) & NGHTTP2_DATA_FLAG_EOF) == 0) {
return NGHTTP2_ERR_DEFERRED;
}
}
return nread;
}
} // namespace

4
src/shrpx_spdy_upstream.cc
View File

@ -834,13 +834,15 @@ ssize_t spdy_data_read_callback(spdylay_session *session,
downstream->disable_upstream_wtimer();
}
if(nread == 0 && *eof != 1) {
if(nread == 0) {
if(downstream->resume_read(SHRPX_NO_BUFFER) != 0) {
return SPDYLAY_ERR_CALLBACK_FAILURE;
}
if(*eof != 1) {
return SPDYLAY_ERR_DEFERRED;
}
}
return nread;
}