This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 73d1fc7 Add a config for internal HPACK header table size limit
73d1fc7 is described below
commit 73d1fc76fb4333385ae16d5aafe8aa652227e53f
Author: Masakazu Kitajo <mas...@apache.org>
AuthorDate: Wed Oct 23 15:58:34 2019 +0900
Add a config for internal HPACK header table size limit
This introduces proxy.config.http2.header_table_size_limit that enables to
configure internal HPACK header table size limit currently hard coded as
64KB.
(cherry picked from commit 9c05e64df3e9eb00f786a42e29bfbdb4ffa76ec1)
---
doc/admin-guide/files/records.config.en.rst | 10 +++++++++-
mgmt/RecordsConfig.cc | 2 ++
proxy/http2/HTTP2.cc | 11 +++++++----
proxy/http2/HTTP2.h | 1 +
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/doc/admin-guide/files/records.config.en.rst
b/doc/admin-guide/files/records.config.en.rst
index 2fe3bf2..6d95181 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -3693,7 +3693,15 @@ HTTP/2 Configuration
:reloadable:
The maximum size of the header compression table used to decode header
- blocks.
+ blocks. This value will be advertised as SETTINGS_HEADER_TABLE_SIZE.
+
+.. ts:cv:: CONFIG proxy.config.http2.header_table_size_limit INT 65536
+ :reloadable:
+
+ The maximum size of the header compression table ATS actually use when ATS
+ encodes headers. Setting 0 means ATS doesn't insert headers into HPACK
+ Dynamic Table, however, headers still can be encoded as indexable
+ representations. The upper limit is 65536.
.. ts:cv:: CONFIG proxy.config.http2.max_header_list_size INT 131072
:reloadable:
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index efdbdc0..311c3de 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1318,6 +1318,8 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.http2.min_avg_window_update", RECD_FLOAT,
"2560.0", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
+ {RECT_CONFIG, "proxy.config.http2.header_table_size_limit", RECD_INT,
"65536", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+ ,
//############
//#
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index 91c4073..e23c44d 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -42,8 +42,8 @@ const unsigned HTTP2_LEN_AUTHORITY = countof(":authority") -
1;
const unsigned HTTP2_LEN_PATH = countof(":path") - 1;
const unsigned HTTP2_LEN_STATUS = countof(":status") - 1;
-static size_t HTTP2_LEN_STATUS_VALUE_STR = 3;
-static const int HTTP2_MAX_TABLE_SIZE_LIMIT = 64 * 1024;
+static size_t HTTP2_LEN_STATUS_VALUE_STR = 3;
+static const uint32_t HTTP2_MAX_TABLE_SIZE_LIMIT = 64 * 1024;
// Statistics
RecRawStatBlock *http2_rsb;
@@ -588,8 +588,9 @@ Http2ErrorCode
http2_encode_header_blocks(HTTPHdr *in, uint8_t *out, uint32_t out_len,
uint32_t *len_written, HpackHandle &handle,
int32_t maximum_table_size)
{
- // Limit the maximum table size to 64kB, which is the size advertised by
major clients
- maximum_table_size = std::min(maximum_table_size,
HTTP2_MAX_TABLE_SIZE_LIMIT);
+ // Limit the maximum table size to the configured value or 64kB at maximum,
which is the size advertised by major clients
+ maximum_table_size =
+ std::min(maximum_table_size,
static_cast<int32_t>(std::min(Http2::header_table_size_limit,
HTTP2_MAX_TABLE_SIZE_LIMIT)));
// Set maximum table size only if it is different from current maximum size
if (maximum_table_size == hpack_get_maximum_table_size(handle)) {
maximum_table_size = -1;
@@ -735,6 +736,7 @@ uint32_t Http2::max_priority_frames_per_minute = 120;
float Http2::min_avg_window_update = 2560.0;
uint32_t Http2::con_slow_log_threshold = 0;
uint32_t Http2::stream_slow_log_threshold = 0;
+uint32_t Http2::header_table_size_limit = 65536;
void
Http2::init()
@@ -761,6 +763,7 @@ Http2::init()
REC_EstablishStaticConfigFloat(min_avg_window_update,
"proxy.config.http2.min_avg_window_update");
REC_EstablishStaticConfigInt32U(con_slow_log_threshold,
"proxy.config.http2.connection.slow.log.threshold");
REC_EstablishStaticConfigInt32U(stream_slow_log_threshold,
"proxy.config.http2.stream.slow.log.threshold");
+ REC_EstablishStaticConfigInt32U(header_table_size_limit,
"proxy.config.http2.header_table_size_limit");
// If any settings is broken, ATS should not start
ink_release_assert(http2_settings_parameter_is_valid({HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
max_concurrent_streams_in}));
diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h
index 47e3cd8..7bcc75f 100644
--- a/proxy/http2/HTTP2.h
+++ b/proxy/http2/HTTP2.h
@@ -388,6 +388,7 @@ public:
static float min_avg_window_update;
static uint32_t con_slow_log_threshold;
static uint32_t stream_slow_log_threshold;
+ static uint32_t header_table_size_limit;
static void init();
};
