Commit b178316f authored by bnc's avatar bnc Committed by Commit bot

Ignore persisent settings on SPDY4.

SpdySession::SendInitialData() now only retrieves and sends server-persisted
SPDY settings for SPDY/3.1 and below.

BUG=408348

Review URL: https://codereview.chromium.org/515353002

Cr-Commit-Position: refs/heads/master@{#292972}
parent 34ddd8e3
......@@ -2735,6 +2735,7 @@ void SpdySession::SendInitialData() {
kDefaultInitialRecvWindowSize - session_recv_window_size_);
}
if (protocol_ <= kProtoSPDY31) {
// Finally, notify the server about the settings they have
// previously told us to use when communicating with them (after
// applying them).
......@@ -2756,6 +2757,7 @@ void SpdySession::SendInitialData() {
}
SendSettings(server_settings_map);
}
}
......
......@@ -1576,7 +1576,9 @@ TEST_P(SpdySessionTest, SendInitialDataOnNewSession) {
initial_max_concurrent_streams);
scoped_ptr<SpdyFrame> server_settings_frame(
spdy_util_.ConstructSpdySettings(server_settings));
if (GetParam() <= kProtoSPDY31) {
writes.push_back(CreateMockWrite(*server_settings_frame));
}
session_deps_.stream_initial_recv_window_size = kInitialRecvWindowSize;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment