summaryrefslogtreecommitdiffstats
path: root/net/http/http_server_properties.cc
diff options
context:
space:
mode:
authorbnc <bnc@chromium.org>2015-08-26 12:36:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-26 19:36:58 +0000
commit79597c33519c653978f7e502eb148fc6098ce596 (patch)
treebd0a0f3858ad9d385cc30ca60146476c6097519f /net/http/http_server_properties.cc
parent54ec34b7c174848672fc3ea08aba7289630df4a3 (diff)
downloadchromium_src-79597c33519c653978f7e502eb148fc6098ce596.zip
chromium_src-79597c33519c653978f7e502eb148fc6098ce596.tar.gz
chromium_src-79597c33519c653978f7e502eb148fc6098ce596.tar.bz2
Remove HTTP/2 draft-14 support.
* Stop advertising "h2-14" in NPN and ALPN. * Remove h2-14 test cases. * Remove kProtoHTTP2_14 from enum NextProto. * Remove NPN_HTTP_2_14 from enum AlternateProtocol. kProtoHTTP2MinimumVersion and kProtoHTTP2MaximumVersion will be removed in a follow-up CL. BUG=345769 Review URL: https://codereview.chromium.org/1310213009 Cr-Commit-Position: refs/heads/master@{#345641}
Diffstat (limited to 'net/http/http_server_properties.cc')
-rw-r--r--net/http/http_server_properties.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc
index 08059c2..1e3ccd2 100644
--- a/net/http/http_server_properties.cc
+++ b/net/http/http_server_properties.cc
@@ -23,7 +23,6 @@ const char* const kAlternateProtocolStrings[] = {
"npn-spdy/2",
"npn-spdy/3",
"npn-spdy/3.1",
- "npn-h2-14", // HTTP/2 draft-14. Called SPDY4 internally.
"npn-h2",
"quic"};
@@ -54,7 +53,6 @@ const char* AlternateProtocolToString(AlternateProtocol protocol) {
case DEPRECATED_NPN_SPDY_2:
case NPN_SPDY_3:
case NPN_SPDY_3_1:
- case NPN_HTTP_2_14:
case NPN_HTTP_2:
case QUIC:
DCHECK(IsAlternateProtocolValid(protocol));
@@ -85,8 +83,6 @@ AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
return NPN_SPDY_3;
case kProtoSPDY31:
return NPN_SPDY_3_1;
- case kProtoHTTP2_14:
- return NPN_HTTP_2_14;
case kProtoHTTP2:
return NPN_HTTP_2;
case kProtoQUIC1SPDY3: