Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Unified Diff: net/socket/ssl_client_socket.cc

Issue 987123002: Advertise HTTP/2 support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/next_proto.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket.cc
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index babd41e42a93046a90b1d403d9d88370fe85250e..5268ad2049bd13dd140186c6264d060c740d494f 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -46,6 +46,8 @@ NextProto SSLClientSocket::NextProtoFromString(
} else if (proto_string == "h2-15") {
// This is the HTTP/2 draft-15 identifier.
return kProtoSPDY4_15;
+ } else if (proto_string == "h2") {
+ return kProtoSPDY4;
} else if (proto_string == "quic/1+spdy/3") {
return kProtoQUIC1SPDY3;
} else {
@@ -71,6 +73,8 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
case kProtoSPDY4_15:
// This is the HTTP/2 draft-15 identifier.
return "h2-15";
+ case kProtoSPDY4:
+ return "h2";
case kProtoQUIC1SPDY3:
return "quic/1+spdy/3";
case kProtoUnknown:
« no previous file with comments | « net/socket/next_proto.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698