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

Fix on_frame_recv_callback called multiple times if CONTINUATION is involved

This commit is contained in:
Tatsuhiro Tsujikawa 2014-02-09 17:00:29 +09:00
parent d495451795
commit a4070be518
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/nghttp2_session.c
View File

@ -3686,12 +3686,6 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
if(iframe->payloadleft) { if(iframe->payloadleft) {
break; break;
} }
if(iframe->state == NGHTTP2_IB_READ_HEADER_BLOCK) {
rv = session_after_header_block_received(session);
if(nghttp2_is_fatal(rv)) {
return rv;
}
}
if((iframe->frame.hd.flags & NGHTTP2_FLAG_END_HEADERS) == 0) { if((iframe->frame.hd.flags & NGHTTP2_FLAG_END_HEADERS) == 0) {
iframe->left = NGHTTP2_FRAME_HEAD_LENGTH; iframe->left = NGHTTP2_FRAME_HEAD_LENGTH;
iframe->error_code = 0; iframe->error_code = 0;
@ -3702,6 +3696,12 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
iframe->state = NGHTTP2_IB_IGN_CONTINUATION; iframe->state = NGHTTP2_IB_IGN_CONTINUATION;
} }
} else { } else {
if(iframe->state == NGHTTP2_IB_READ_HEADER_BLOCK) {
rv = session_after_header_block_received(session);
if(nghttp2_is_fatal(rv)) {
return rv;
}
}
nghttp2_inbound_frame_reset(session); nghttp2_inbound_frame_reset(session);
} }
break; break;