Skip to content
Snippets Groups Projects
Commit 2fe75ec4 authored by Craig Tiller's avatar Craig Tiller
Browse files

Fix bad merge

parent 5d3f2e62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/core/ext/transport/chttp2/transport/writing.c
+ 4
− 0
View file @ 2fe75ec4
...@@ -51,6 +51,10 @@ int grpc_chttp2_unlocking_check_writes( ...@@ -51,6 +51,10 @@ int grpc_chttp2_unlocking_check_writes(
GPR_TIMER_BEGIN("grpc_chttp2_unlocking_check_writes", 0); 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 && if (transport_global->dirtied_local_settings &&
!transport_global->sent_local_settings) { !transport_global->sent_local_settings) {
gpr_slice_buffer_add( gpr_slice_buffer_add(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment