From 42baef7a5c2658d767cc15db5834e1f4b7bd4746 Mon Sep 17 00:00:00 2001 From: "rtenneti@google.com" Date: Sat, 10 Dec 2011 04:52:10 +0000 Subject: 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 --- net/socket/ssl_client_socket.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'net/socket/ssl_client_socket.cc') diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index b1e31f5..6bcbe7e 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -22,6 +22,8 @@ SSLClientSocket::NextProto SSLClientSocket::NextProtoFromString( return kProtoSPDY1; } else if (proto_string == "spdy/2") { return kProtoSPDY2; + } else if (proto_string == "spdy/2.1") { + return kProtoSPDY21; } else { return kProtoUnknown; } @@ -91,6 +93,15 @@ bool SSLClientSocket::set_was_spdy_negotiated(bool negotiated) { return was_spdy_negotiated_ = negotiated; } +SSLClientSocket::NextProto SSLClientSocket::next_protocol_negotiated() const { + return next_protocol_; +} + +void SSLClientSocket::set_next_protocol_negotiated( + SSLClientSocket::NextProto next_protocol) { + next_protocol_ = next_protocol; +} + bool SSLClientSocket::was_origin_bound_cert_sent() const { return was_origin_bound_cert_sent_; } -- cgit v1.1