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

nghttpx: Refactor http2_data_read_callback

This commit is contained in:
Tatsuhiro Tsujikawa 2014-11-22 21:11:18 +09:00
parent 1a09cef0ef
commit bd9389b956
1 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/shrpx_http2_downstream_connection.cc
View File

@ -196,9 +196,8 @@ ssize_t http2_data_read_callback(nghttp2_session *session,
return NGHTTP2_ERR_DEFERRED; return NGHTTP2_ERR_DEFERRED;
} }
auto body = dconn->get_request_body_buf(); auto body = dconn->get_request_body_buf();
int nread = 0;
for(;;) { auto nread = evbuffer_remove(body, buf, length);
nread = evbuffer_remove(body, buf, length);
if(nread == -1) { if(nread == -1) {
DCLOG(FATAL, dconn) << "evbuffer_remove() failed"; DCLOG(FATAL, dconn) << "evbuffer_remove() failed";
return NGHTTP2_ERR_CALLBACK_FAILURE; return NGHTTP2_ERR_CALLBACK_FAILURE;
@ -218,42 +217,32 @@ ssize_t http2_data_read_callback(nghttp2_session *session,
if(sd->dconn == nullptr) { if(sd->dconn == nullptr) {
return NGHTTP2_ERR_DEFERRED; return NGHTTP2_ERR_DEFERRED;
} }
break;
} }
if(downstream->get_request_state() == Downstream::MSG_COMPLETE) { if(evbuffer_get_length(body) == 0 &&
if(!downstream->get_upgrade_request() || downstream->get_request_state() == Downstream::MSG_COMPLETE &&
// If connection is upgraded, don't set EOF flag, since HTTP/1
// will set MSG_COMPLETE to request state after upgrade response
// header is seen.
(!downstream->get_upgrade_request() ||
(downstream->get_response_state() == Downstream::HEADER_COMPLETE && (downstream->get_response_state() == Downstream::HEADER_COMPLETE &&
!downstream->get_upgraded())) { !downstream->get_upgraded()))) {
*data_flags |= NGHTTP2_DATA_FLAG_EOF; *data_flags |= NGHTTP2_DATA_FLAG_EOF;
} else {
downstream->disable_downstream_wtimer();
return NGHTTP2_ERR_DEFERRED;
}
break;
} else {
if(evbuffer_get_length(body) == 0) {
// Check get_request_state() == MSG_COMPLETE just in case
if(downstream->get_request_state() == Downstream::MSG_COMPLETE) {
*data_flags |= NGHTTP2_DATA_FLAG_EOF;
break;
} }
downstream->disable_downstream_wtimer(); if(evbuffer_get_length(body) > 0) {
return NGHTTP2_ERR_DEFERRED;
}
}
}
if(evbuffer_get_length(body) > 0 && !downstream->get_output_buffer_full()) {
downstream->reset_downstream_wtimer(); downstream->reset_downstream_wtimer();
} else { } else {
downstream->disable_downstream_wtimer(); downstream->disable_downstream_wtimer();
} }
if(nread == 0 && (*data_flags & NGHTTP2_DATA_FLAG_EOF) == 0) {
downstream->disable_downstream_wtimer();
return NGHTTP2_ERR_DEFERRED;
}
return nread; return nread;
} }
} // namespace } // namespace