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

nghttpx: Treat unexpected HEADERS as stream error

This commit is contained in:
Tatsuhiro Tsujikawa 2014-07-31 21:46:50 +09:00
parent c13329b328
commit 9d78167297
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/shrpx_http2_session.cc
View File

@ -898,6 +898,8 @@ int on_response_headers(Http2Session *http2session,
downstream->normalize_response_headers(); downstream->normalize_response_headers();
auto& nva = downstream->get_response_headers(); auto& nva = downstream->get_response_headers();
downstream->set_expect_final_response(false);
if(!http2::check_http2_headers(nva)) { if(!http2::check_http2_headers(nva)) {
http2session->submit_rst_stream(frame->hd.stream_id, http2session->submit_rst_stream(frame->hd.stream_id,
NGHTTP2_PROTOCOL_ERROR); NGHTTP2_PROTOCOL_ERROR);
@ -951,8 +953,6 @@ int on_response_headers(Http2Session *http2session,
return 0; return 0;
} }
downstream->set_expect_final_response(false);
auto content_length = http2::get_header(nva, "content-length"); auto content_length = http2::get_header(nva, "content-length");
if(!content_length && downstream->get_request_method() != "HEAD" && if(!content_length && downstream->get_request_method() != "HEAD" &&
downstream->get_request_method() != "CONNECT") { downstream->get_request_method() != "CONNECT") {
@ -1036,7 +1036,7 @@ int on_frame_recv_callback
} else if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { } else if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
if(downstream->get_response_state() != Downstream::MSG_RESET) { if(downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
downstream->set_response_state(Downstream::MSG_COMPLETE); downstream->set_response_state(Downstream::MSG_COMPLETE);
@ -1071,18 +1071,21 @@ int on_frame_recv_callback
} }
} }
if(frame->headers.cat == NGHTTP2_HCAT_HEADERS && if(frame->headers.cat == NGHTTP2_HCAT_HEADERS) {
downstream->get_expect_final_response()) { if(downstream->get_expect_final_response()) {
rv = on_response_headers(http2session, downstream, session, frame); rv = on_response_headers(http2session, downstream, session, frame);
if(rv != 0) { if(rv != 0) {
return rv; return rv;
}
} else if((frame->hd.flags & NGHTTP2_FLAG_END_STREAM) == 0) {
return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
} }
} }
if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
if(downstream->get_response_state() != Downstream::MSG_RESET) { if(downstream->get_response_state() == Downstream::HEADER_COMPLETE) {
downstream->set_response_state(Downstream::MSG_COMPLETE); downstream->set_response_state(Downstream::MSG_COMPLETE);
auto upstream = downstream->get_upstream(); auto upstream = downstream->get_upstream();

2
src/shrpx_http2_upstream.cc
View File

@ -426,6 +426,8 @@ int on_frame_recv_callback
if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) { if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
downstream->end_upload_data(); downstream->end_upload_data();
downstream->set_request_state(Downstream::MSG_COMPLETE); downstream->set_request_state(Downstream::MSG_COMPLETE);
} else {
return NGHTTP2_ERR_CALLBACK_FAILURE;
} }
break; break;