diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-12-09 15:34:27 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-12-09 15:34:27 -0800 |
| commit | b897337994a355d7d8aeca043b608fa1e100bf79 (patch) | |
| tree | 779439f28e3f20bcd17acc6fa24c679e19fc58c7 /src/core/transport | |
| parent | face446997e271107553a071c46f8ca0fde0bebb (diff) | |
| parent | 9bfc2ce06cd700fcbaa701914b4b294b7d601948 (diff) | |
Merge github.com:grpc/grpc into connectivity-state
Diffstat (limited to 'src/core/transport')
| -rw-r--r-- | src/core/transport/chttp2/frame_settings.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/frame_settings.c b/src/core/transport/chttp2/frame_settings.c index d7c9f7ed69..f03fb45908 100644 --- a/src/core/transport/chttp2/frame_settings.c +++ b/src/core/transport/chttp2/frame_settings.c @@ -44,6 +44,8 @@ #include "src/core/transport/chttp2/http2_errors.h" #include "src/core/transport/chttp2_transport.h" +#define MAX_MAX_HEADER_LIST_SIZE (1024*1024*1024) + /* HTTP/2 mandated initial connection settings */ const grpc_chttp2_setting_parameters grpc_chttp2_settings_parameters[GRPC_CHTTP2_NUM_SETTINGS] = { @@ -60,7 +62,7 @@ const grpc_chttp2_setting_parameters GRPC_CHTTP2_FLOW_CONTROL_ERROR}, {"MAX_FRAME_SIZE", 16384, 16384, 16777215, GRPC_CHTTP2_DISCONNECT_ON_INVALID_VALUE, GRPC_CHTTP2_PROTOCOL_ERROR}, - {"MAX_HEADER_LIST_SIZE", 0xffffffffu, 0, 0xffffffffu, + {"MAX_HEADER_LIST_SIZE", MAX_MAX_HEADER_LIST_SIZE, 0, MAX_MAX_HEADER_LIST_SIZE, GRPC_CHTTP2_CLAMP_INVALID_VALUE, GRPC_CHTTP2_PROTOCOL_ERROR}, }; |