From dae22c5cddc8f1ebdfe77e66ebbf834255f94319 Mon Sep 17 00:00:00 2001 From: "mbelshe@chromium.org" Date: Fri, 30 Jul 2010 02:16:35 +0000 Subject: 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 --- net/socket/ssl_client_socket.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'net/socket/ssl_client_socket.h') 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; } -- cgit v1.1