Ignore persisent settings on SPDY4.

net/spdy/spdy_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 2717 matching lines @@
     // has to go here since the WINDOW_UPDATE frame sent by
     // IncreaseRecvWindowSize() call uses |buffered_spdy_framer_|.
     DCHECK_GT(kDefaultInitialRecvWindowSize, session_recv_window_size_);
     // This condition implies that |kDefaultInitialRecvWindowSize| -
     // |session_recv_window_size_| doesn't overflow.
     DCHECK_GT(session_recv_window_size_, 0);
     IncreaseRecvWindowSize(
         kDefaultInitialRecvWindowSize - session_recv_window_size_);
   }
 
-  // Finally, notify the server about the settings they have
-  // previously told us to use when communicating with them (after
-  // applying them).
-  const SettingsMap& server_settings_map =
-      http_server_properties_->GetSpdySettings(host_port_pair());
-  if (server_settings_map.empty())
-    return;
+  if (protocol_ <= kProtoSPDY31) {

[Bence, 2014/08/28 20:07:58]

Do we want to use persisent settings if protocol_ == ProtoQUIC1SPDY3?

+    // Finally, notify the server about the settings they have
+    // previously told us to use when communicating with them (after
+    // applying them).
+    const SettingsMap& server_settings_map =
+        http_server_properties_->GetSpdySettings(host_port_pair());
+    if (server_settings_map.empty())
+      return;
 
-  SettingsMap::const_iterator it =
-      server_settings_map.find(SETTINGS_CURRENT_CWND);
-  uint32 cwnd = (it != server_settings_map.end()) ? it->second.second : 0;
-  UMA_HISTOGRAM_CUSTOM_COUNTS("Net.SpdySettingsCwndSent", cwnd, 1, 200, 100);
+    SettingsMap::const_iterator it =
+        server_settings_map.find(SETTINGS_CURRENT_CWND);
+    uint32 cwnd = (it != server_settings_map.end()) ? it->second.second : 0;
+    UMA_HISTOGRAM_CUSTOM_COUNTS("Net.SpdySettingsCwndSent", cwnd, 1, 200, 100);
 
-  for (SettingsMap::const_iterator it = server_settings_map.begin();
-       it != server_settings_map.end(); ++it) {
-    const SpdySettingsIds new_id = it->first;
-    const uint32 new_val = it->second.second;
-    HandleSetting(new_id, new_val);
+    for (SettingsMap::const_iterator it = server_settings_map.begin();
+         it != server_settings_map.end(); ++it) {
+      const SpdySettingsIds new_id = it->first;
+      const uint32 new_val = it->second.second;
+      HandleSetting(new_id, new_val);
+    }
+
+    SendSettings(server_settings_map);
   }
-
-  SendSettings(server_settings_map);
 }
 
 
 void SpdySession::SendSettings(const SettingsMap& settings) {
   net_log_.AddEvent(
       NetLog::TYPE_SPDY_SESSION_SEND_SETTINGS,
       base::Bind(&NetLogSpdySendSettingsCallback, &settings));
 
   // Create the SETTINGS frame and send it.
   DCHECK(buffered_spdy_framer_.get());
@@ skipping 438 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net