diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 18:42:12 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 18:42:12 +0000 |
| commit | 39c48fcca9e6dfcd163778ed17d3eff865cf204b (patch) | |
| tree | eb28e6daabb23f5d290466102dc729da83708271 /net/socket | |
| parent | a1b9abbd91e5cfa56fb2649ce86709fac623f4ed (diff) | |
| download | chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.zip chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.tar.gz chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.tar.bz2 | |
SPDY - integration of spdy/3 code.
TEST=network unit tests and browser unit_tests
R=willchan
Review URL: https://chromiumcodereview.appspot.com/9618002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket.cc | 4 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index 3d881fb..ecee79b 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -25,6 +25,8 @@ SSLClientSocket::NextProto SSLClientSocket::NextProtoFromString( return kProtoSPDY2; } else if (proto_string == "spdy/2.1") { return kProtoSPDY21; + } else if (proto_string == "spdy/3") { + return kProtoSPDY3; } else { return kProtoUnknown; } @@ -41,6 +43,8 @@ const char* SSLClientSocket::NextProtoToString( return "spdy/2"; case kProtoSPDY21: return "spdy/2.1"; + case kProtoSPDY3: + return "spdy/3"; default: break; } diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index 53f7f97..0c96546 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -303,7 +303,8 @@ int SSLConnectJob::DoSSLConnectComplete(int result) { // TODO(mbelshe): verify it was a protocol we advertised? if (protocol_negotiated == SSLClientSocket::kProtoSPDY1 || protocol_negotiated == SSLClientSocket::kProtoSPDY2 || - protocol_negotiated == SSLClientSocket::kProtoSPDY21) { + protocol_negotiated == SSLClientSocket::kProtoSPDY21 || + protocol_negotiated == SSLClientSocket::kProtoSPDY3) { ssl_socket_->set_was_spdy_negotiated(true); } } |