diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-09-09 14:19:13 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-09-09 14:19:13 -0700 |
| commit | 2fe75ec4596d524f5c105328c2fbf9219943d936 (patch) | |
| tree | 402a42b110d84642d8e2a92e8a7aa497dbb24820 /src/core/ext/transport | |
| parent | 5d3f2e628606c14904063d0347999f89ce779354 (diff) | |
Fix bad merge
Diffstat (limited to 'src/core/ext/transport')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/writing.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/ext/transport/chttp2/transport/writing.c b/src/core/ext/transport/chttp2/transport/writing.c index 95a7674d0f..979515bd54 100644 --- a/src/core/ext/transport/chttp2/transport/writing.c +++ b/src/core/ext/transport/chttp2/transport/writing.c @@ -51,6 +51,10 @@ int grpc_chttp2_unlocking_check_writes( GPR_TIMER_BEGIN("grpc_chttp2_unlocking_check_writes", 0); + transport_writing->max_frame_size = + transport_global->settings[GRPC_ACKED_SETTINGS] + [GRPC_CHTTP2_SETTINGS_MAX_FRAME_SIZE]; + if (transport_global->dirtied_local_settings && !transport_global->sent_local_settings) { gpr_slice_buffer_add( |