Rename HTTP/3 SETTINGS_MAX_HEADER_LIST_SIZE to SETTINGS_MAX_FIELD_SECTION_SIZE.
This matches https://datatracker.ietf.org/doc/html/draft-ietf-quic-http-30#section-7.2.4.1.
PiperOrigin-RevId: 332947488
Change-Id: I2546a3b3c437567ab160805bae19fdcb53a0c935
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index d5bfc79..610a473 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -2666,7 +2666,7 @@
if (!version_.UsesHttp3()) {
SpdyFramer spdy_framer(SpdyFramer::ENABLE_COMPRESSION);
SpdySettingsIR settings_frame;
- settings_frame.AddSetting(SETTINGS_MAX_HEADER_LIST_SIZE,
+ settings_frame.AddSetting(spdy::SETTINGS_MAX_HEADER_LIST_SIZE,
kDefaultMaxUncompressedHeaderSize);
SpdySerializedFrame frame(spdy_framer.SerializeFrame(settings_frame));
diff --git a/quic/core/http/http_constants.h b/quic/core/http/http_constants.h
index 8a3436c..5164a4b 100644
--- a/quic/core/http/http_constants.h
+++ b/quic/core/http/http_constants.h
@@ -30,7 +30,7 @@
// Same value as spdy::SETTINGS_HEADER_TABLE_SIZE.
SETTINGS_QPACK_MAX_TABLE_CAPACITY = 0x01,
// Same value as spdy::SETTINGS_MAX_HEADER_LIST_SIZE.
- SETTINGS_MAX_HEADER_LIST_SIZE = 0x06,
+ SETTINGS_MAX_FIELD_SECTION_SIZE = 0x06,
SETTINGS_QPACK_BLOCKED_STREAMS = 0x07,
};
diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc
index c7b4c39..9e1b08a 100644
--- a/quic/core/http/quic_headers_stream_test.cc
+++ b/quic/core/http/quic_headers_stream_test.cc
@@ -663,7 +663,7 @@
// Respect supported settings frames SETTINGS_HEADER_TABLE_SIZE,
// SETTINGS_MAX_HEADER_LIST_SIZE.
data.AddSetting(SETTINGS_HEADER_TABLE_SIZE, kTestHeaderTableSize);
- data.AddSetting(SETTINGS_MAX_HEADER_LIST_SIZE, 2000);
+ data.AddSetting(spdy::SETTINGS_MAX_HEADER_LIST_SIZE, 2000);
SpdySerializedFrame frame(framer_->SerializeFrame(data));
stream_frame_.data_buffer = frame.data();
stream_frame_.data_length = frame.size();
diff --git a/quic/core/http/quic_receive_control_stream_test.cc b/quic/core/http/quic_receive_control_stream_test.cc
index e908162..af80654 100644
--- a/quic/core/http/quic_receive_control_stream_test.cc
+++ b/quic/core/http/quic_receive_control_stream_test.cc
@@ -157,7 +157,7 @@
TEST_P(QuicReceiveControlStreamTest, ReceiveSettings) {
SettingsFrame settings;
settings.values[3] = 2;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
settings.values[SETTINGS_QPACK_BLOCKED_STREAMS] = 12;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 37;
std::string data = EncodeSettings(settings);
@@ -224,7 +224,7 @@
TEST_P(QuicReceiveControlStreamTest, ReceiveSettingsFragments) {
SettingsFrame settings;
settings.values[3] = 2;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
std::string data = EncodeSettings(settings);
std::string data1 = data.substr(0, 1);
std::string data2 = data.substr(1, data.length() - 1);
diff --git a/quic/core/http/quic_spdy_client_session_base.cc b/quic/core/http/quic_spdy_client_session_base.cc
index db6f9ea..1bfe2a7 100644
--- a/quic/core/http/quic_spdy_client_session_base.cc
+++ b/quic/core/http/quic_spdy_client_session_base.cc
@@ -232,12 +232,12 @@
bool QuicSpdyClientSessionBase::OnSettingsFrame(const SettingsFrame& frame) {
if (!was_zero_rtt_rejected()) {
if (max_outbound_header_list_size() != std::numeric_limits<size_t>::max() &&
- frame.values.find(SETTINGS_MAX_HEADER_LIST_SIZE) ==
+ frame.values.find(SETTINGS_MAX_FIELD_SECTION_SIZE) ==
frame.values.end()) {
CloseConnectionWithDetails(
QUIC_HTTP_ZERO_RTT_RESUMPTION_SETTINGS_MISMATCH,
"Server accepted 0-RTT but omitted non-default "
- "SETTINGS_MAX_HEADER_LIST_SIZE");
+ "SETTINGS_MAX_FIELD_SECTION_SIZE");
return false;
}
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc
index 70b7b36..42ece43 100644
--- a/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -204,7 +204,7 @@
if (session_->version().UsesHttp3()) {
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 2;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
settings.values[256] = 4; // unknown setting
session_->OnSettingsFrame(settings);
}
@@ -969,7 +969,7 @@
CompleteCryptoHandshake();
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 2;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
settings.values[256] = 4; // unknown setting
char application_state[] = {// type (SETTINGS)
0x04,
@@ -979,7 +979,7 @@
0x01,
// content
0x02,
- // identifier (SETTINGS_MAX_HEADER_LIST_SIZE)
+ // identifier (SETTINGS_MAX_FIELD_SECTION_SIZE)
0x06,
// content
0x05,
@@ -1078,7 +1078,7 @@
if (session_->version().UsesHttp3()) {
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 2;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
settings.values[256] = 4; // unknown setting
session_->OnSettingsFrame(settings);
}
@@ -1400,7 +1400,7 @@
// Let the session receive a different SETTINGS frame.
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 1;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
settings.values[256] = 4; // unknown setting
session_->OnSettingsFrame(settings);
}
@@ -1430,8 +1430,8 @@
// Let the session receive a different SETTINGS frame.
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 2;
- // setting on SETTINGS_MAX_HEADER_LIST_SIZE is reduced.
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 4;
+ // setting on SETTINGS_MAX_FIELD_SECTION_SIZE is reduced.
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 4;
settings.values[256] = 4; // unknown setting
session_->OnSettingsFrame(settings);
}
@@ -1455,8 +1455,8 @@
// Let the session receive a different SETTINGS frame.
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 1;
- // Intentionally omit SETTINGS_MAX_HEADER_LIST_SIZE which was previously sent
- // with a non-zero value.
+ // Intentionally omit SETTINGS_MAX_FIELD_SECTION_SIZE which was previously
+ // sent with a non-zero value.
settings.values[256] = 4; // unknown setting
session_->OnSettingsFrame(settings);
}
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index e8f4db8..50be81d 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -475,7 +475,7 @@
qpack_maximum_dynamic_table_capacity_;
settings_.values[SETTINGS_QPACK_BLOCKED_STREAMS] =
qpack_maximum_blocked_streams_;
- settings_.values[SETTINGS_MAX_HEADER_LIST_SIZE] =
+ settings_.values[SETTINGS_MAX_FIELD_SECTION_SIZE] =
max_inbound_header_list_size_;
}
@@ -1000,9 +1000,9 @@
std::min(value, qpack_maximum_dynamic_table_capacity_));
break;
}
- case SETTINGS_MAX_HEADER_LIST_SIZE:
+ case SETTINGS_MAX_FIELD_SECTION_SIZE:
QUIC_DVLOG(1) << ENDPOINT
- << "SETTINGS_MAX_HEADER_LIST_SIZE received with value "
+ << "SETTINGS_MAX_FIELD_SECTION_SIZE received with value "
<< value;
if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2) &&
max_outbound_header_list_size_ !=
@@ -1016,7 +1016,7 @@
was_zero_rtt_rejected()
? "Server rejected 0-RTT, aborting because "
: "",
- "Server sent an SETTINGS_MAX_HEADER_LIST_SIZE: ", value,
+ "Server sent an SETTINGS_MAX_FIELD_SECTION_SIZE: ", value,
"which reduces current value: ",
max_outbound_header_list_size_));
return false;
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index c8fdf4c..7ce419a 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -2415,7 +2415,7 @@
SettingsFrame settings;
settings.values[SETTINGS_QPACK_MAX_TABLE_CAPACITY] = 512;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
settings.values[SETTINGS_QPACK_BLOCKED_STREAMS] = 42;
std::string data = EncodeSettings(settings);
QuicStreamFrame frame(stream_id, false, 1, quiche::QuicheStringPiece(data));
@@ -2448,7 +2448,7 @@
char type[] = {kControlStream};
SettingsFrame settings;
settings.values[3] = 2;
- settings.values[SETTINGS_MAX_HEADER_LIST_SIZE] = 5;
+ settings.values[SETTINGS_MAX_FIELD_SECTION_SIZE] = 5;
std::string data = EncodeSettings(settings);
QuicStreamFrame data1(stream_id, false, 1, quiche::QuicheStringPiece(data));
@@ -2857,7 +2857,7 @@
if (VersionUsesHttp3(transport_version())) {
EXPECT_EQ(std::numeric_limits<size_t>::max(),
session_.max_outbound_header_list_size());
- session_.OnSetting(SETTINGS_MAX_HEADER_LIST_SIZE, 5);
+ session_.OnSetting(SETTINGS_MAX_FIELD_SECTION_SIZE, 5);
EXPECT_EQ(5u, session_.max_outbound_header_list_size());
EXPECT_CALL(*writer_, WritePacket(_, _, _, _, _))
@@ -2878,7 +2878,7 @@
EXPECT_EQ(std::numeric_limits<size_t>::max(),
session_.max_outbound_header_list_size());
- session_.OnSetting(SETTINGS_MAX_HEADER_LIST_SIZE, 5);
+ session_.OnSetting(SETTINGS_MAX_FIELD_SECTION_SIZE, 5);
EXPECT_EQ(5u, session_.max_outbound_header_list_size());
EXPECT_TRUE(session_.server_push_enabled());
diff --git a/quic/core/http/spdy_utils.cc b/quic/core/http/spdy_utils.cc
index 69dd3d0..847408d 100644
--- a/quic/core/http/spdy_utils.cc
+++ b/quic/core/http/spdy_utils.cc
@@ -160,7 +160,7 @@
Http3AndQpackSettingsIdentifiers identifier) {
switch (identifier) {
RETURN_STRING_LITERAL(SETTINGS_QPACK_MAX_TABLE_CAPACITY);
- RETURN_STRING_LITERAL(SETTINGS_MAX_HEADER_LIST_SIZE);
+ RETURN_STRING_LITERAL(SETTINGS_MAX_FIELD_SECTION_SIZE);
RETURN_STRING_LITERAL(SETTINGS_QPACK_BLOCKED_STREAMS);
}
return quiche::QuicheStrCat("UNSUPPORTED_SETTINGS_TYPE(", identifier, ")");
