Deprecate --gfe2_reloadable_flag_quic_limit_encoder_dynamic_table_size. PiperOrigin-RevId: 442775529
diff --git a/quiche/quic/core/http/quic_headers_stream_test.cc b/quiche/quic/core/http/quic_headers_stream_test.cc index d72eded..89c60bd 100644 --- a/quiche/quic/core/http/quic_headers_stream_test.cc +++ b/quiche/quic/core/http/quic_headers_stream_test.cc
@@ -629,7 +629,7 @@ ->header_encoder_table_size()); } -// Regression bug for b/208997000. +// Regression test for b/208997000. TEST_P(QuicHeadersStreamTest, LimitEncoderDynamicTableSize) { const uint32_t kVeryLargeTableSizeLimit = 1024 * 1024 * 1024; SpdySettingsIR data; @@ -638,14 +638,8 @@ stream_frame_.data_buffer = frame.data(); stream_frame_.data_length = frame.size(); headers_stream_->OnStreamFrame(stream_frame_); - if (GetQuicReloadableFlag(quic_limit_encoder_dynamic_table_size)) { - EXPECT_EQ(16384u, QuicSpdySessionPeer::GetSpdyFramer(&session_) - ->header_encoder_table_size()); - } else { - EXPECT_EQ(kVeryLargeTableSizeLimit, - QuicSpdySessionPeer::GetSpdyFramer(&session_) - ->header_encoder_table_size()); - } + EXPECT_EQ(16384u, QuicSpdySessionPeer::GetSpdyFramer(&session_) + ->header_encoder_table_size()); } TEST_P(QuicHeadersStreamTest, RespectHttp2SettingsFrameUnsupportedFields) {
diff --git a/quiche/quic/core/http/quic_spdy_session.cc b/quiche/quic/core/http/quic_spdy_session.cc index 003929f..7c1de92 100644 --- a/quiche/quic/core/http/quic_spdy_session.cc +++ b/quiche/quic/core/http/quic_spdy_session.cc
@@ -1214,13 +1214,8 @@ QUIC_DVLOG(1) << ENDPOINT << "SETTINGS_HEADER_TABLE_SIZE received with value " << value; - if (GetQuicReloadableFlag(quic_limit_encoder_dynamic_table_size)) { - QUIC_RELOADABLE_FLAG_COUNT(quic_limit_encoder_dynamic_table_size); - spdy_framer_.UpdateHeaderEncoderTableSize( - std::min<uint64_t>(value, kHpackEncoderDynamicTableSizeLimit)); - break; - } - spdy_framer_.UpdateHeaderEncoderTableSize(value); + spdy_framer_.UpdateHeaderEncoderTableSize( + std::min<uint64_t>(value, kHpackEncoderDynamicTableSizeLimit)); break; case spdy::SETTINGS_ENABLE_PUSH: if (perspective() == Perspective::IS_SERVER) {
diff --git a/quiche/quic/core/http/quic_spdy_session_test.cc b/quiche/quic/core/http/quic_spdy_session_test.cc index c625f49..06b2959 100644 --- a/quiche/quic/core/http/quic_spdy_session_test.cc +++ b/quiche/quic/core/http/quic_spdy_session_test.cc
@@ -3674,7 +3674,7 @@ EXPECT_TRUE(session_.SupportsWebTransport()); } -// Regression bug for b/208997000. +// Regression test for b/208997000. TEST_P(QuicSpdySessionTestClient, LimitEncoderDynamicTableSize) { if (version().UsesHttp3()) { return; @@ -3705,43 +3705,25 @@ QuicStreamSendBufferPeer::CurrentWriteSlice(&send_buffer)->slice; absl::string_view stream_data(slice.data(), slice.length()); - if (GetQuicReloadableFlag(quic_limit_encoder_dynamic_table_size)) { - EXPECT_EQ(absl::HexStringToBytes( - "000009" // frame length - "01" // frame type HEADERS - "25"), // flags END_STREAM | END_HEADERS | PRIORITY - stream_data.substr(0, 5)); - stream_data.remove_prefix(5); - } else { - EXPECT_EQ(absl::HexStringToBytes( - "00000c" // frame length - "01" // frame type HEADERS - "25"), // flags END_STREAM | END_HEADERS | PRIORITY - stream_data.substr(0, 5)); - stream_data.remove_prefix(5); - } + EXPECT_EQ(absl::HexStringToBytes( + "000009" // frame length + "01" // frame type HEADERS + "25"), // flags END_STREAM | END_HEADERS | PRIORITY + stream_data.substr(0, 5)); + stream_data.remove_prefix(5); // Ignore stream ID as it might differ between QUIC versions. stream_data.remove_prefix(4); - // Ignore stream dependency and weight. EXPECT_EQ(absl::HexStringToBytes("00000000" // stream dependency "92"), // stream weight stream_data.substr(0, 5)); stream_data.remove_prefix(5); - if (GetQuicReloadableFlag(quic_limit_encoder_dynamic_table_size)) { - EXPECT_EQ(absl::HexStringToBytes( - "3fe17f" // Dynamic Table Size Update to 16384 - "82"), // Indexed Header Field Representation with index 2 - stream_data); - } else { - EXPECT_EQ( - absl::HexStringToBytes( - "3fe1ffffff03" // Dynamic Table Size Update to 1024 * 1024 * 1024 - "82"), // Indexed Header Field Representation with index 2 - stream_data); - } + EXPECT_EQ(absl::HexStringToBytes( + "3fe17f" // Dynamic Table Size Update to 16384 + "82"), // Indexed Header Field Representation with index 2 + stream_data); } class QuicSpdySessionTestServerNoExtendedConnect
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h index 2ab566c..794e4f7 100644 --- a/quiche/quic/core/quic_flags_list.h +++ b/quiche/quic/core/quic_flags_list.h
@@ -69,8 +69,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_remove_connection_migration_connection_option_v2, false) // If true, include stream information in idle timeout connection close detail. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true) -// If true, limit the size of HPACK encoder dynamic table to 16 kB. Only affects gQUIC; QPACK encoder dynamic table size used in IETF QUIC is already bounded. -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_limit_encoder_dynamic_table_size, true) // If true, quic server will send ENABLE_CONNECT_PROTOCOL setting and and endpoint will validate required request/response headers and extended CONNECT mechanism and update code counts of valid/invalid headers. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_verify_request_headers_2, true) // If true, record addresses that server has sent reset to recently, and do not send reset if the address lives in the set.