diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 01:22:57 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 01:22:57 +0000 |
| commit | a1f1cb2cbab36077059266a1e5141104fd2ec995 (patch) | |
| tree | 6c8f10eedeb5e10ae6af77b68002c268601e9d52 /net/http/http_stream_factory.h | |
| parent | aa3be97db621ecfb620487f2a0f4f0c4529c0668 (diff) | |
| download | chromium_src-a1f1cb2cbab36077059266a1e5141104fd2ec995.zip chromium_src-a1f1cb2cbab36077059266a1e5141104fd2ec995.tar.gz chromium_src-a1f1cb2cbab36077059266a1e5141104fd2ec995.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
Review URL: https://codereview.chromium.org/21131002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory.h')
| -rw-r--r-- | net/http/http_stream_factory.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index bebfb8c..6db6905 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h @@ -278,6 +278,11 @@ class NET_EXPORT HttpStreamFactory { // the protocols supported via NPN or Alternate-Protocol. static void EnableNpnSpdy4a2(); + // Sets http/1.1, quic, spdy/2, spdy/3, spdy/3.1, spdy/4a2, and + // http/2 draft 04 as the protocols supported via NPN or + // Alternate-Protocol. + static void EnableNpnHttp2Draft04(); + // Sets the protocols supported by NPN (next protocol negotiation) during the // SSL handshake as well as by HTTP Alternate-Protocol. static void SetNextProtos(const std::vector<NextProto>& value); |