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

Unified Diff: net/http/http_response_info.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/http/http_response_info.h ('k') | net/http/http_server_properties.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_response_info.cc
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index 2ec0fb5cf2b0d26950fb9a7133ac9bd75a0245c7..6967d797792b4dc72665fb09a55d274836d8ec67 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -369,8 +369,10 @@ HttpResponseInfo::ConnectionInfo HttpResponseInfo::ConnectionInfoFromNextProto(
case kProtoSPDY3:
case kProtoSPDY31:
return CONNECTION_INFO_SPDY3;
- case kProtoSPDY4:
- return CONNECTION_INFO_SPDY4;
+ case kProtoSPDY4_14:
+ return CONNECTION_INFO_HTTP2_14;
+ case kProtoSPDY4_15:
+ return CONNECTION_INFO_HTTP2_15;
case kProtoQUIC1SPDY3:
return CONNECTION_INFO_QUIC1_SPDY3;
@@ -395,9 +397,12 @@ std::string HttpResponseInfo::ConnectionInfoToString(
return "spdy/2";
case CONNECTION_INFO_SPDY3:
return "spdy/3";
- case CONNECTION_INFO_SPDY4:
- // This is the HTTP/2 draft-15 identifier. For internal
- // consistency, HTTP/2 is named SPDY4 within Chromium.
+ case CONNECTION_INFO_HTTP2_14:
+ // For internal consistency, HTTP/2 is named SPDY4 within Chromium.
+ // This is the HTTP/2 draft-14 identifier.
+ return "h2-14";
+ case CONNECTION_INFO_HTTP2_15:
+ // This is the HTTP/2 draft-15 identifier.
return "h2-15";
case CONNECTION_INFO_QUIC1_SPDY3:
return "quic/1+spdy/3";
« no previous file with comments | « net/http/http_response_info.h ('k') | net/http/http_server_properties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698