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

nghttpx: Fix stream hang when http2 downstream CONNECT failed

This commit is contained in:
Tatsuhiro Tsujikawa 2013-08-24 00:28:50 +09:00
parent 005e60a5ed
commit e55abcd634
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_spdy_downstream_connection.cc
View File

@ -180,8 +180,12 @@ ssize_t spdy_data_read_callback(nghttp2_session *session,
nread = evbuffer_remove(body, buf, length); nread = evbuffer_remove(body, buf, length);
if(nread == 0) { if(nread == 0) {
if(downstream->get_request_state() == Downstream::MSG_COMPLETE) { if(downstream->get_request_state() == Downstream::MSG_COMPLETE) {
if(!downstream->get_upgrade_request()) { if(!downstream->get_upgrade_request() ||
(downstream->get_response_state() == Downstream::HEADER_COMPLETE &&
!downstream->get_upgraded())) {
*eof = 1; *eof = 1;
} else {
return NGHTTP2_ERR_DEFERRED;
} }
break; break;
} else { } else {

4
src/shrpx_spdy_session.cc
View File

@ -828,6 +828,10 @@ void on_frame_recv_callback
SSLOG(INFO, spdy) << "HTTP upgrade success. stream_id=" SSLOG(INFO, spdy) << "HTTP upgrade success. stream_id="
<< frame->hd.stream_id; << frame->hd.stream_id;
} }
} else if(downstream->get_request_method() == "CONNECT") {
// If request is CONNECT, terminate request body to avoid for
// stream to stall.
downstream->end_upload_data();
} }
rv = upstream->on_downstream_header_complete(downstream); rv = upstream->on_downstream_header_complete(downstream);
if(rv != 0) { if(rv != 0) {