From a1f1cb2cbab36077059266a1e5141104fd2ec995 Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Tue, 30 Jul 2013 01:22:57 +0000 Subject: [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 Review URL: https://codereview.chromium.org/21131002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214289 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_server_properties.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'net/http/http_server_properties.h') diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h index b017a3f..654d262 100644 --- a/net/http/http_server_properties.h +++ b/net/http/http_server_properties.h @@ -24,7 +24,9 @@ enum AlternateProtocol { NPN_SPDY_3, NPN_SPDY_3_1, NPN_SPDY_4A2, - NPN_SPDY_MAXIMUM_VERSION = NPN_SPDY_4A2, + // We lump in HTTP/2 with the SPDY protocols for now. + NPN_HTTP2_DRAFT_04, + NPN_SPDY_MAXIMUM_VERSION = NPN_HTTP2_DRAFT_04, QUIC, NUM_ALTERNATE_PROTOCOLS, ALTERNATE_PROTOCOL_BROKEN, // The alternate protocol is known to be broken. @@ -54,7 +56,6 @@ typedef std::map PipelineCapabilityMap; extern const char kAlternateProtocolHeader[]; -extern const char* const kAlternateProtocolStrings[NUM_ALTERNATE_PROTOCOLS]; // The interface for setting/retrieving the HTTP server properties. // Currently, this class manages servers': -- cgit v1.1