diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-10 04:52:10 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-10 04:52:10 +0000 |
| commit | 42baef7a5c2658d767cc15db5834e1f4b7bd4746 (patch) | |
| tree | acc5161c111cbf1db516538acfc660dd1caa32e2 /net/socket/ssl_client_socket_pool.cc | |
| parent | 83260e00ec89e0a98492a1d3f5aad64684c3316d (diff) | |
| download | chromium_src-42baef7a5c2658d767cc15db5834e1f4b7bd4746.zip chromium_src-42baef7a5c2658d767cc15db5834e1f4b7bd4746.tar.gz chromium_src-42baef7a5c2658d767cc15db5834e1f4b7bd4746.tar.bz2 | |
SPDY - add support for spdy/2.1 to support flow control.
1) Add spdy/2.1 as a supported NPN protocol.
2) Advertise that chrome supports spdy/2.1 when --flow-control (spdy
flag) is enabled.
3) When SPDY protocol is negotiated, enable flow_control in
spdy_session if spdy/2.1 is negotiated as NPN protocol.
BUG=106911
R=willchan
TEST=network unit tests and if possible test with SPDY 2.1 server
with command line flag --flow-control.
This CL is same as the following CL. Implemented changes suggested
by willchan in the following review.
http://codereview.chromium.org/8890044/
Review URL: http://codereview.chromium.org/8892026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index 2cc1cde..1ec0453 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -302,8 +302,10 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { // advertised it, so allow it. // TODO(mbelshe): verify it was a protocol we advertised? if (next_protocol == SSLClientSocket::kProtoSPDY1 || - next_protocol == SSLClientSocket::kProtoSPDY2) { + next_protocol == SSLClientSocket::kProtoSPDY2 || + next_protocol == SSLClientSocket::kProtoSPDY21) { ssl_socket_->set_was_spdy_negotiated(true); + ssl_socket_->set_next_protocol_negotiated(next_protocol); } } if (params_->want_spdy_over_npn() && !ssl_socket_->was_spdy_negotiated()) |