diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 02:16:35 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 02:16:35 +0000 |
| commit | dae22c5cddc8f1ebdfe77e66ebbf834255f94319 (patch) | |
| tree | f949e3011b81a4b1234c90311a074fda63706e9c /net/socket/ssl_client_socket.h | |
| parent | d420c31e107cd932582a4a8add0ce2676e4b52da (diff) | |
| download | chromium_src-dae22c5cddc8f1ebdfe77e66ebbf834255f94319.zip chromium_src-dae22c5cddc8f1ebdfe77e66ebbf834255f94319.tar.gz chromium_src-dae22c5cddc8f1ebdfe77e66ebbf834255f94319.tar.bz2 | |
Bump the SPDY protocol version to version 2.
Remove "http1.1" and "spdy" from the NPN advertisement string (the
proper values are "http/1.1" and "spdy/2", which were included redundantly).
BUG=50550
TEST=existing
Review URL: http://codereview.chromium.org/3044034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket.h')
| -rw-r--r-- | net/socket/ssl_client_socket.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index ec41c43..7e5e080 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -45,6 +45,7 @@ class SSLClientSocket : public ClientSocket { kProtoUnknown = 0, kProtoHTTP11 = 1, kProtoSPDY1 = 2, + kProtoSPDY2 = 3, }; // Gets the SSL connection information of the socket. @@ -67,8 +68,10 @@ class SSLClientSocket : public ClientSocket { static NextProto NextProtoFromString(const std::string& proto_string) { if (proto_string == "http1.1" || proto_string == "http/1.1") { return kProtoHTTP11; - } else if (proto_string == "spdy" || proto_string == "spdy/1") { + } else if (proto_string == "spdy/1") { return kProtoSPDY1; + } else if (proto_string == "spdy/2") { + return kProtoSPDY2; } else { return kProtoUnknown; } |