diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 20:42:36 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 20:42:36 +0000 |
| commit | d5b42bdd76ee895b0b4f6895400ba23c60decc96 (patch) | |
| tree | c22819d9514580389d15ed82e4a79b806ebfefd2 /net/http | |
| parent | 84981baa4338eec37363ad541054df96b3ad456a (diff) | |
| download | chromium_src-d5b42bdd76ee895b0b4f6895400ba23c60decc96.zip chromium_src-d5b42bdd76ee895b0b4f6895400ba23c60decc96.tar.gz chromium_src-d5b42bdd76ee895b0b4f6895400ba23c60decc96.tar.bz2 | |
[SPDY] Incorporate latest framing changes from HTTP2 into SPDY 4 as SPDY 4a2.
Removes support for SPDY 4a1.
Remove --enable-spdy4 flag for now (until we get test
coverage).
This lands server change 45362310.
BUG=230124
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14189003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_server_properties.cc | 2 | ||||
| -rw-r--r-- | net/http/http_server_properties.h | 2 | ||||
| -rw-r--r-- | net/http/http_stream_factory.cc | 16 | ||||
| -rw-r--r-- | net/http/http_stream_factory.h | 4 |
4 files changed, 4 insertions, 20 deletions
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc index 48b21ac..81a0e98 100644 --- a/net/http/http_server_properties.cc +++ b/net/http/http_server_properties.cc @@ -17,7 +17,7 @@ const char* const kAlternateProtocolStrings[] = { "npn-spdy/2", "npn-spdy/3", "npn-spdy/3.1", - "npn-spdy/4a1", + "npn-spdy/4a2", "quic" }; const char kBrokenAlternateProtocol[] = "Broken"; diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h index 28a608f..e1fb9db 100644 --- a/net/http/http_server_properties.h +++ b/net/http/http_server_properties.h @@ -20,7 +20,7 @@ enum AlternateProtocol { NPN_SPDY_2, NPN_SPDY_3, NPN_SPDY_3_1, - NPN_SPDY_4a1, + NPN_SPDY_4A2, QUIC, NUM_ALTERNATE_PROTOCOLS, ALTERNATE_PROTOCOL_BROKEN, // The alternate protocol is known to be broken. diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc index 8432fb6..05114ba 100644 --- a/net/http/http_stream_factory.cc +++ b/net/http/http_stream_factory.cc @@ -180,18 +180,6 @@ void HttpStreamFactory::EnableNpnSpdy31() { } // static -void HttpStreamFactory::EnableNpnSpdy4a1() { - set_use_alternate_protocols(true); - std::vector<std::string> next_protos; - next_protos.push_back("http/1.1"); - next_protos.push_back("spdy/2"); - next_protos.push_back("spdy/3"); - next_protos.push_back("spdy/3.1"); - next_protos.push_back("spdy/4a1"); - SetNextProtos(next_protos); -} - -// static void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) { if (!next_protos_) next_protos_ = new std::vector<std::string>; @@ -212,8 +200,8 @@ void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) { enabled_protocols_[NPN_SPDY_3] = true; } else if (value[i] == "spdy/3.1") { enabled_protocols_[NPN_SPDY_3_1] = true; - } else if (value[i] == "spdy/4a1") { - enabled_protocols_[NPN_SPDY_4a1] = true; + } else if (value[i] == "spdy/4a2") { + enabled_protocols_[NPN_SPDY_4A2] = true; } else if (value[i] == "quic") { enabled_protocols_[QUIC] = true; } diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index c131897..eaadcc7 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h @@ -246,10 +246,6 @@ class NET_EXPORT HttpStreamFactory { // supported via NPN. static void EnableNpnSpdy31(); - // Sets http/1.1, spdy/2, spdy/3, spdy/3.1, and spdy/4a1 as the - // protocols supported via NPN. - static void EnableNpnSpdy4a1(); - // 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<std::string>& value); |