From 94c7e8974263c985768ce5d8e25b919280938d64 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 10 Mar 2012 18:49:25 +0900 Subject: [PATCH] Renamed SPDYLAY_CONCURRENT_STREAMS_MAX as SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS --- examples/SpdyServer.cc | 2 +- lib/includes/spdylay/spdylay.h | 2 +- lib/spdylay_session.c | 4 ++-- tests/spdylay_session_test.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/SpdyServer.cc b/examples/SpdyServer.cc index 89e25772..92d3c103 100644 --- a/examples/SpdyServer.cc +++ b/examples/SpdyServer.cc @@ -182,7 +182,7 @@ SpdyEventHandler::SpdyEventHandler(const Config* config, assert(r == 0); spdylay_settings_entry entry; entry.settings_id = SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS; - entry.value = SPDYLAY_CONCURRENT_STREAMS_MAX; + entry.value = SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS; entry.flags = SPDYLAY_ID_FLAG_SETTINGS_NONE; r = spdylay_submit_settings(session_, SPDYLAY_FLAG_SETTINGS_NONE, &entry, 1); diff --git a/lib/includes/spdylay/spdylay.h b/lib/includes/spdylay/spdylay.h index 8874cd6d..056f58ae 100644 --- a/lib/includes/spdylay/spdylay.h +++ b/lib/includes/spdylay/spdylay.h @@ -153,7 +153,7 @@ typedef enum { #define SPDYLAY_SETTINGS_MAX 8 /* Default maximum concurrent streams */ -#define SPDYLAY_CONCURRENT_STREAMS_MAX 100 +#define SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS 100 /* Status code for RST_STREAM */ typedef enum { diff --git a/lib/spdylay_session.c b/lib/spdylay_session.c index 444021f6..17a751c2 100644 --- a/lib/spdylay_session.c +++ b/lib/spdylay_session.c @@ -164,14 +164,14 @@ static int spdylay_session_new(spdylay_session **session_ptr, memset((*session_ptr)->remote_settings, 0, sizeof((*session_ptr)->remote_settings)); (*session_ptr)->remote_settings[SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS] = - SPDYLAY_CONCURRENT_STREAMS_MAX; + SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS; (*session_ptr)->remote_settings[SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE] = SPDYLAY_INITIAL_WINDOW_SIZE; memset((*session_ptr)->local_settings, 0, sizeof((*session_ptr)->local_settings)); (*session_ptr)->local_settings[SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS] = - SPDYLAY_CONCURRENT_STREAMS_MAX; + SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS; (*session_ptr)->local_settings[SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE] = SPDYLAY_INITIAL_WINDOW_SIZE; diff --git a/tests/spdylay_session_test.c b/tests/spdylay_session_test.c index afe890fc..8fc135a6 100644 --- a/tests/spdylay_session_test.c +++ b/tests/spdylay_session_test.c @@ -1931,7 +1931,7 @@ void test_spdylay_submit_settings() iv, 3)); /* Make sure that local settings are not changed */ - CU_ASSERT(SPDYLAY_CONCURRENT_STREAMS_MAX == + CU_ASSERT(SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS == session->local_settings[SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS]); CU_ASSERT(SPDYLAY_INITIAL_WINDOW_SIZE == session->local_settings[SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE]);