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

Ignore unknown settings ID

This commit is contained in:
Tatsuhiro Tsujikawa 2014-06-07 16:41:36 +09:00
parent d402ba6fa2
commit 70c86979e8
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/nghttp2_session.c
View File

@ -4078,6 +4078,7 @@ static int inbound_frame_set_settings_entry(nghttp2_inbound_frame *iframe)
case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
break; break;
default: default:
DEBUGF(fprintf(stderr, "recv: ignore unknown settings id=0x%02x\n"));
return -1; return -1;
} }
@ -4898,25 +4899,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
} }
if(readlen > 0) { if(readlen > 0) {
rv = inbound_frame_set_settings_entry(iframe); inbound_frame_set_settings_entry(iframe);
if(rv != 0) {
DEBUGF(fprintf(stderr, "recv: bad settings received\n"));
rv = nghttp2_session_terminate_session(session,
NGHTTP2_PROTOCOL_ERROR);
if(nghttp2_is_fatal(rv)) {
return rv;
}
if(iframe->payloadleft == 0) {
session_inbound_frame_reset(session);
break;
}
iframe->state = NGHTTP2_IB_IGN_PAYLOAD;
break;
}
} }
if(iframe->payloadleft) { if(iframe->payloadleft) {
inbound_frame_set_mark(iframe, NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH); inbound_frame_set_mark(iframe, NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH);