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

nghttpx: Don't send RST_STREAM CANCEL to a pushed stream repeatedly

This commit is contained in:
Tatsuhiro Tsujikawa 2016-09-27 23:49:01 +09:00
parent 97aa4dabc8
commit 600605400c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shrpx_http2_session.cc
View File

@ -860,7 +860,7 @@ int on_header_callback2(nghttp2_session *session, const nghttp2_frame *frame,
nghttp2_session_get_stream_user_data(session, promised_stream_id)); nghttp2_session_get_stream_user_data(session, promised_stream_id));
if (!promised_sd || !promised_sd->dconn) { if (!promised_sd || !promised_sd->dconn) {
http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL); http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
return 0; return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
} }
auto promised_downstream = promised_sd->dconn->get_downstream(); auto promised_downstream = promised_sd->dconn->get_downstream();
@ -965,7 +965,7 @@ int on_begin_headers_callback(nghttp2_session *session,
nghttp2_session_get_stream_user_data(session, frame->hd.stream_id)); nghttp2_session_get_stream_user_data(session, frame->hd.stream_id));
if (!sd || !sd->dconn) { if (!sd || !sd->dconn) {
http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL); http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
return 0; return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
} }
auto downstream = sd->dconn->get_downstream(); auto downstream = sd->dconn->get_downstream();
@ -976,6 +976,7 @@ int on_begin_headers_callback(nghttp2_session *session,
if (http2session->handle_downstream_push_promise(downstream, if (http2session->handle_downstream_push_promise(downstream,
promised_stream_id) != 0) { promised_stream_id) != 0) {
http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL); http2session->submit_rst_stream(promised_stream_id, NGHTTP2_CANCEL);
return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
} }
return 0; return 0;