Rename SpdySession::kInitialMaxConcurrentStreams to

   SpdySession::kMaxPushedConcurrentStreams

Add comment to SpdySession global variables:
   g_init_max_concurrent_streams = 100;
   g_max_concurrent_stream_limit = 256;

Fix bug in SpdySession::ResetStaticSettingsToInit introduced in r142228.


Review URL: https://chromiumcodereview.appspot.com/10676003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144307 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 6 deletions

diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 7a7275e..192baad 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -172,7 +172,11 @@ Value* NetLogSpdyGoAwayCallback(SpdyStreamId last_stream_id,
 }
 
 NextProto g_default_protocol = kProtoUnknown;
+// Maximum number of concurrent streams we will create, unless the server
+// sends a SETTINGS frame with a different value.
 size_t g_init_max_concurrent_streams = 100;
+// The maximum number of concurrent streams we will ever create.  Even if
+// the server permits more, we will never exceed this limit.
 size_t g_max_concurrent_stream_limit = 256;
 size_t g_default_initial_rcv_window_size = 10 * 1024 * 1024;  // 10MB
 bool g_enable_ping_based_connection_checking = true;
@@ -209,7 +213,7 @@ void SpdySession::set_default_initial_recv_window_size(size_t value) {
 void SpdySession::ResetStaticSettingsToInit() {
   // WARNING: These must match the initializers above.
   g_default_protocol = kProtoUnknown;
-  g_init_max_concurrent_streams = 10;
+  g_init_max_concurrent_streams = 100;
   g_max_concurrent_stream_limit = 256;
   g_default_initial_rcv_window_size = kSpdyStreamInitialWindowSize;
   g_enable_ping_based_connection_checking = true;
@@ -1589,7 +1593,7 @@ void SpdySession::SendInitialSettings() {
     // Create a new settings frame notifying the sever of our
     // max_concurrent_streams_ and initial window size.
     settings_map[SETTINGS_MAX_CONCURRENT_STREAMS] =
-        SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kInitialMaxConcurrentStreams);
+        SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kMaxConcurrentPushedStreams);
     if (GetProtocolVersion() > 2 &&
         initial_recv_window_size_ != kSpdyStreamInitialWindowSize) {
       settings_map[SETTINGS_INITIAL_WINDOW_SIZE] =
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index a23bdc5..844d37b 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -40,8 +40,8 @@ namespace net {
 const int kMss = 1430;
 const int kMaxSpdyFrameChunkSize = (2 * kMss) - SpdyFrame::kHeaderSize;
 
-// Specifies the maxiumum concurrent streams server could send.
-const int kInitialMaxConcurrentStreams = 1000;
+// Specifies the maxiumum concurrent streams server could send (via push).
+const int kMaxConcurrentPushedStreams = 1000;
 
 class BoundNetLog;
 class SpdyStream;
diff --git a/net/spdy/spdy_session_spdy2_unittest.cc b/net/spdy/spdy_session_spdy2_unittest.cc
index 53720fd..6ee4257 100644
--- a/net/spdy/spdy_session_spdy2_unittest.cc
+++ b/net/spdy/spdy_session_spdy2_unittest.cc
@@ -679,7 +679,7 @@ TEST_F(SpdySessionSpdy2Test, SendInitialSettingsOnNewSession) {
   SettingsMap settings;
   const SpdySettingsIds kSpdySettingsIds1 = SETTINGS_MAX_CONCURRENT_STREAMS;
   settings[kSpdySettingsIds1] =
-      SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kInitialMaxConcurrentStreams);
+      SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kMaxConcurrentPushedStreams);
   MockConnect connect_data(SYNCHRONOUS, OK);
   scoped_ptr<SpdyFrame> settings_frame(ConstructSpdySettings(settings));
   MockWrite writes[] = {
diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc
index b43e17e..299186e 100644
--- a/net/spdy/spdy_session_spdy3_unittest.cc
+++ b/net/spdy/spdy_session_spdy3_unittest.cc
@@ -681,7 +681,7 @@ TEST_F(SpdySessionSpdy3Test, SendInitialSettingsOnNewSession) {
   const SpdySettingsIds kSpdySettingsIds2 = SETTINGS_INITIAL_WINDOW_SIZE;
   const uint32 kInitialRecvWindowSize = 10 * 1024 * 1024;
   settings[kSpdySettingsIds1] =
-      SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kInitialMaxConcurrentStreams);
+      SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kMaxConcurrentPushedStreams);
   settings[kSpdySettingsIds2] =
       SettingsFlagsAndValue(SETTINGS_FLAG_NONE, kInitialRecvWindowSize);
   MockConnect connect_data(SYNCHRONOUS, OK);