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

Unified Diff: net/socket/ssl_client_socket.cc

Issue 485833002: HTTP2 draft 14 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ignore_result(). Created 6 years, 4 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/quic/quic_headers_stream_test.cc ('k') | net/spdy/buffered_spdy_framer.h » ('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 044368b011fb37c2aa32a48188476ea22ccebb46..33e0ab96a963cf2d3db6cc7963a7f312ca8cdf53 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -33,8 +33,8 @@ NextProto SSLClientSocket::NextProtoFromString(
return kProtoSPDY3;
} else if (proto_string == "spdy/3.1") {
return kProtoSPDY31;
- } else if (proto_string == "h2-13") {
- // This is the HTTP/2 draft 13 identifier. For internal
+ } else if (proto_string == "h2-14") {
+ // This is the HTTP/2 draft 14 identifier. For internal
// consistency, HTTP/2 is named SPDY4 within Chromium.
return kProtoSPDY4;
} else if (proto_string == "quic/1+spdy/3") {
@@ -56,9 +56,9 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
case kProtoSPDY31:
return "spdy/3.1";
case kProtoSPDY4:
- // This is the HTTP/2 draft 13 identifier. For internal
+ // This is the HTTP/2 draft 14 identifier. For internal
// consistency, HTTP/2 is named SPDY4 within Chromium.
- return "h2-13";
+ return "h2-14";
case kProtoQUIC1SPDY3:
return "quic/1+spdy/3";
case kProtoUnknown:
« no previous file with comments | « net/quic/quic_headers_stream_test.cc ('k') | net/spdy/buffered_spdy_framer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698