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

Rename NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE as NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE

This commit is contained in:
Tatsuhiro Tsujikawa 2014-07-31 21:14:14 +09:00
parent 77374ac6e2
commit 742b28833a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/includes/nghttp2/nghttp2.h
View File

@ -516,9 +516,9 @@ typedef enum {
*/ */
NGHTTP2_SETTINGS_MAX_FRAME_SIZE = 0x05, NGHTTP2_SETTINGS_MAX_FRAME_SIZE = 0x05,
/** /**
* SETTINGS_MAX_HEADER_SET_SIZE * SETTINGS_MAX_HEADER_LIST_SIZE
*/ */
NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE = 0x06 NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 0x06
} nghttp2_settings_id; } nghttp2_settings_id;
/* Note: If we add SETTINGS, update the capacity of /* Note: If we add SETTINGS, update the capacity of
NGHTTP2_INBOUND_NUM_IV as well */ NGHTTP2_INBOUND_NUM_IV as well */

2
lib/nghttp2_frame.c
View File

@ -1043,7 +1043,7 @@ int nghttp2_iv_check(const nghttp2_settings_entry *iv, size_t niv)
return 0; return 0;
} }
break; break;
case NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE: case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
break; break;
default: default:
return 0; return 0;

8
lib/nghttp2_session.c
View File

@ -3278,7 +3278,7 @@ int nghttp2_session_update_local_settings(nghttp2_session *session,
case NGHTTP2_SETTINGS_MAX_FRAME_SIZE: case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
session->local_settings.max_frame_size = iv[i].value; session->local_settings.max_frame_size = iv[i].value;
break; break;
case NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE: case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
session->local_settings.max_header_set_size = iv[i].value; session->local_settings.max_header_set_size = iv[i].value;
break; break;
} }
@ -3414,7 +3414,7 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
session->remote_settings.max_frame_size = entry->value; session->remote_settings.max_frame_size = entry->value;
break; break;
case NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE: case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
session->remote_settings.max_header_set_size = entry->value; session->remote_settings.max_header_set_size = entry->value;
@ -4167,7 +4167,7 @@ static void inbound_frame_set_settings_entry(nghttp2_inbound_frame *iframe)
case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS: case NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS:
case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE: case NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE:
case NGHTTP2_SETTINGS_MAX_FRAME_SIZE: case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
case NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE: case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
break; break;
default: default:
DEBUGF(fprintf(stderr, "recv: ignore unknown settings id=0x%02x\n", DEBUGF(fprintf(stderr, "recv: ignore unknown settings id=0x%02x\n",
@ -5737,7 +5737,7 @@ uint32_t nghttp2_session_get_remote_settings(nghttp2_session *session,
return session->remote_settings.initial_window_size; return session->remote_settings.initial_window_size;
case NGHTTP2_SETTINGS_MAX_FRAME_SIZE: case NGHTTP2_SETTINGS_MAX_FRAME_SIZE:
return session->remote_settings.max_frame_size; return session->remote_settings.max_frame_size;
case NGHTTP2_SETTINGS_MAX_HEADER_SET_SIZE: case NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE:
return session->remote_settings.max_header_set_size; return session->remote_settings.max_header_set_size;
} }