commit 425c25a8ad2d190f61531fd46e0a65050cc1b98a
author bnc <bnc@google.com> Thu Jan 07 13:14:51 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Jan 07 13:16:26 2021 -0800
tree d90fcf9109db7f2ddee3562ea21fa760db1fbc8e
parent e1c0321eb3fda27d100e18e3f501fe8210ef7d5a

Add SETTINGS_DEPRECATE_HTTP2_PRIORITIES.

PiperOrigin-RevId: 350624574
Change-Id: Iead0cb06eb169be219ead7f5047de7ba2530e846

spdy/core/spdy_protocol.cc

diff --git a/spdy/core/spdy_protocol.cc b/spdy/core/spdy_protocol.cc
index c3cca28..b455dfb 100644
--- a/spdy/core/spdy_protocol.cc
+++ b/spdy/core/spdy_protocol.cc
@@ -176,6 +176,7 @@
     case SETTINGS_MAX_FRAME_SIZE:
     case SETTINGS_MAX_HEADER_LIST_SIZE:
     case SETTINGS_ENABLE_CONNECT_PROTOCOL:
+    case SETTINGS_DEPRECATE_HTTP2_PRIORITIES:
     case SETTINGS_EXPERIMENT_SCHEDULER:
       // FALLTHROUGH_INTENDED
       return true;
@@ -205,6 +206,8 @@
       return "SETTINGS_MAX_HEADER_LIST_SIZE";
     case SETTINGS_ENABLE_CONNECT_PROTOCOL:
       return "SETTINGS_ENABLE_CONNECT_PROTOCOL";
+    case SETTINGS_DEPRECATE_HTTP2_PRIORITIES:
+      return "SETTINGS_DEPRECATE_HTTP2_PRIORITIES";
     case SETTINGS_EXPERIMENT_SCHEDULER:
       return "SETTINGS_EXPERIMENT_SCHEDULER";
   }

spdy/core/spdy_protocol.h

diff --git a/spdy/core/spdy_protocol.h b/spdy/core/spdy_protocol.h
index 8a7d7ff..ae33330 100644
--- a/spdy/core/spdy_protocol.h
+++ b/spdy/core/spdy_protocol.h
@@ -151,9 +151,12 @@
   // The maximum size of header list that the sender is prepared to accept.
   SETTINGS_MAX_HEADER_LIST_SIZE = 0x6,
   // Enable Websockets over HTTP/2, see
-  // https://tools.ietf.org/html/draft-ietf-httpbis-h2-websockets-00.
+  // https://httpwg.org/specs/rfc8441.html
   SETTINGS_ENABLE_CONNECT_PROTOCOL = 0x8,
-  SETTINGS_MAX = SETTINGS_ENABLE_CONNECT_PROTOCOL,
+  // Disable HTTP/2 priorities, see
+  // https://tools.ietf.org/html/draft-ietf-httpbis-priority-02.
+  SETTINGS_DEPRECATE_HTTP2_PRIORITIES = 0x9,
+  SETTINGS_MAX = SETTINGS_DEPRECATE_HTTP2_PRIORITIES,
   // Experimental setting used to configure an alternative write scheduler.
   SETTINGS_EXPERIMENT_SCHEDULER = 0xFF45,
 };

spdy/core/spdy_protocol_test.cc

diff --git a/spdy/core/spdy_protocol_test.cc b/spdy/core/spdy_protocol_test.cc
index 0bc55b0..966c471 100644
--- a/spdy/core/spdy_protocol_test.cc
+++ b/spdy/core/spdy_protocol_test.cc
@@ -121,7 +121,9 @@
   EXPECT_FALSE(ParseSettingsId(7, &setting_id));
   EXPECT_TRUE(ParseSettingsId(8, &setting_id));
   EXPECT_EQ(SETTINGS_ENABLE_CONNECT_PROTOCOL, setting_id);
-  EXPECT_FALSE(ParseSettingsId(9, &setting_id));
+  EXPECT_TRUE(ParseSettingsId(9, &setting_id));
+  EXPECT_EQ(SETTINGS_DEPRECATE_HTTP2_PRIORITIES, setting_id);
+  EXPECT_FALSE(ParseSettingsId(10, &setting_id));
   EXPECT_FALSE(ParseSettingsId(0xFF44, &setting_id));
   EXPECT_TRUE(ParseSettingsId(0xFF45, &setting_id));
   EXPECT_EQ(SETTINGS_EXPERIMENT_SCHEDULER, setting_id);
@@ -142,7 +144,9 @@
       {SETTINGS_MAX_HEADER_LIST_SIZE, "SETTINGS_MAX_HEADER_LIST_SIZE"},
       {7, "SETTINGS_UNKNOWN_7"},
       {SETTINGS_ENABLE_CONNECT_PROTOCOL, "SETTINGS_ENABLE_CONNECT_PROTOCOL"},
-      {9, "SETTINGS_UNKNOWN_9"},
+      {SETTINGS_DEPRECATE_HTTP2_PRIORITIES,
+       "SETTINGS_DEPRECATE_HTTP2_PRIORITIES"},
+      {0xa, "SETTINGS_UNKNOWN_a"},
       {0xFF44, "SETTINGS_UNKNOWN_ff44"},
       {0xFF45, "SETTINGS_EXPERIMENT_SCHEDULER"},
       {0xFF46, "SETTINGS_UNKNOWN_ff46"}};