diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 07:13:32 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 07:13:32 +0000 |
| commit | 88a332620b1316b88bd1569538d81f49d2de6e43 (patch) | |
| tree | d1d192dd124b39960a7e8d9abcee0d8aed7f80b2 /net/http/http_response_info.h | |
| parent | afa9cd922e16df2d9fb60cc96d01f49b29b7f1e5 (diff) | |
| download | chromium_src-88a332620b1316b88bd1569538d81f49d2de6e43.zip chromium_src-88a332620b1316b88bd1569538d81f49d2de6e43.tar.gz chromium_src-88a332620b1316b88bd1569538d81f49d2de6e43.tar.bz2 | |
[SPDY] Add strings and constants for HTTP/2 draft 04
There are still differences between SPDY/4 and HTTP/2 draft 04; those
will be ironed out in upcoming CLs.
Add kProtoHTTP2Draft04 to SPDY NextProto-parametrized tests.
Move NextProto -> SpdyMajorVersion conversion to buffered_spdy_framer.h.
Remove unused SpdyMajorVersion -> NextProto conversion.
Clean up HttpResponseInfo::ConnectionInfo a bit and add a TODO to
remove it.
Parametrize SSLClientSocketPoolTest on NextProto.
BUG=265615
R=darin@chromium.org, rch@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=214289
Review URL: https://codereview.chromium.org/21131002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_response_info.h')
| -rw-r--r-- | net/http/http_response_info.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h index 5c15cb9..907ec96 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -11,6 +11,7 @@ #include "net/base/host_port_pair.h" #include "net/base/net_export.h" #include "net/http/http_vary_data.h" +#include "net/socket/next_proto.h" #include "net/ssl/ssl_info.h" class Pickle; @@ -25,13 +26,20 @@ class SSLCertRequestInfo; class NET_EXPORT HttpResponseInfo { public: // Describes the kind of connection used to fetch this response. + // + // NOTE: This is persisted to the cache, so make sure not to reorder + // these values. + // + // TODO(akalin): Better yet, just use a string instead of an enum, + // like |npn_negotiated_protocol|. enum ConnectionInfo { CONNECTION_INFO_UNKNOWN = 0, CONNECTION_INFO_HTTP1 = 1, CONNECTION_INFO_SPDY2 = 2, CONNECTION_INFO_SPDY3 = 3, - CONNECTION_INFO_SPDY4 = 4, + CONNECTION_INFO_SPDY4A2 = 4, CONNECTION_INFO_QUIC1_SPDY3 = 5, + CONNECTION_INFO_HTTP2_DRAFT_04 = 6, NUM_OF_CONNECTION_INFOS, }; @@ -127,6 +135,8 @@ class NET_EXPORT HttpResponseInfo { // Any metadata asociated with this resource's cached data. scoped_refptr<IOBufferWithSize> metadata; + static ConnectionInfo ConnectionInfoFromNextProto(NextProto next_proto); + static std::string ConnectionInfoToString(ConnectionInfo connection_info); }; |