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

Use SPDY/3 name in spdylay_settings_flag. 

Added SPDYLAY_SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE.
This commit is contained in:
Tatsuhiro Tsujikawa 2012-03-09 21:34:50 +09:00
parent 2568fb95b6
commit 6c9e79e8ca
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/includes/spdylay/spdylay.h
View File

@ -128,7 +128,7 @@ typedef enum {
typedef enum { typedef enum {
SPDYLAY_FLAG_SETTINGS_NONE = 0, SPDYLAY_FLAG_SETTINGS_NONE = 0,
SPDYLAY_FLAG_SETTINGS_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 1 SPDYLAY_FLAG_SETTINGS_CLEAR_SETTINGS = 1
} spdylay_settings_flag; } spdylay_settings_flag;
typedef enum { typedef enum {
@ -144,11 +144,13 @@ typedef enum {
SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS = 4, SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS = 4,
SPDYLAY_SETTINGS_CURRENT_CWND = 5, SPDYLAY_SETTINGS_CURRENT_CWND = 5,
SPDYLAY_SETTINGS_DOWNLOAD_RETRANS_RATE = 6, SPDYLAY_SETTINGS_DOWNLOAD_RETRANS_RATE = 6,
SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE = 7 SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE = 7,
/* This first appeared in SPDY/3 */
SPDYLAY_SETTINGS_CLIENT_CERTIFICATE_VECTOR_SIZE = 8
} spdylay_settings_id; } spdylay_settings_id;
/* Maximum ID of spdylay_settings_id. */ /* Maximum ID of spdylay_settings_id. */
#define SPDYLAY_SETTINGS_MAX 7 #define SPDYLAY_SETTINGS_MAX 8
/* Default maximum concurrent streams */ /* Default maximum concurrent streams */
#define SPDYLAY_CONCURRENT_STREAMS_MAX 100 #define SPDYLAY_CONCURRENT_STREAMS_MAX 100

6
tests/spdylay_frame_test.c
View File

@ -461,8 +461,7 @@ void test_spdylay_frame_pack_settings_version(uint16_t version)
iv[2].value = 65536; iv[2].value = 65536;
spdylay_frame_settings_init spdylay_frame_settings_init
(&frame.settings, version, (&frame.settings, version, SPDYLAY_FLAG_SETTINGS_CLEAR_SETTINGS,
SPDYLAY_FLAG_SETTINGS_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS,
spdylay_frame_iv_copy(iv, 3), 3); spdylay_frame_iv_copy(iv, 3), 3);
framelen = spdylay_frame_pack_settings(&buf, &buflen, &frame.settings); framelen = spdylay_frame_pack_settings(&buf, &buflen, &frame.settings);
CU_ASSERT(8+4+3*8 == framelen); CU_ASSERT(8+4+3*8 == framelen);
@ -475,8 +474,7 @@ void test_spdylay_frame_pack_settings_version(uint16_t version)
CU_ASSERT(version == oframe.settings.hd.version); CU_ASSERT(version == oframe.settings.hd.version);
CU_ASSERT(SPDYLAY_SETTINGS == oframe.settings.hd.type); CU_ASSERT(SPDYLAY_SETTINGS == oframe.settings.hd.type);
CU_ASSERT(SPDYLAY_FLAG_SETTINGS_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS == CU_ASSERT(SPDYLAY_FLAG_SETTINGS_CLEAR_SETTINGS == oframe.settings.hd.flags);
oframe.settings.hd.flags);
CU_ASSERT(framelen-SPDYLAY_FRAME_HEAD_LENGTH == oframe.settings.hd.length); CU_ASSERT(framelen-SPDYLAY_FRAME_HEAD_LENGTH == oframe.settings.hd.length);
CU_ASSERT(3 == oframe.settings.niv); CU_ASSERT(3 == oframe.settings.niv);