diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-09-03 16:36:23 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-09-03 16:36:23 -0700 |
| commit | fa62267c78a86f6fee39477d6424e20ed5245fa5 (patch) | |
| tree | dbf14d185bf8620daa782c2654711f78e116e55a /src/core | |
| parent | b5391e1ae68fefd2caa72ca694152da48282174e (diff) | |
| parent | 51bfda063a903c15429cede9ab9dab4c355b7c9a (diff) | |
Merge branch 'release-0_11' of github.com:grpc/grpc into insert-branch-name
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/census/grpc_filter.c | 1 | ||||
| -rw-r--r-- | src/core/transport/chttp2_transport.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index e01c9a2ad4..8b6ba1d472 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -36,7 +36,6 @@ #include <stdio.h> #include <string.h> -#include "include/grpc/census.h" #include "src/core/channel/channel_stack.h" #include "src/core/channel/noop_filter.h" #include "src/core/statistics/census_interface.h" diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c index aa6a860c67..9e3d7dd551 100644 --- a/src/core/transport/chttp2_transport.c +++ b/src/core/transport/chttp2_transport.c @@ -695,9 +695,9 @@ static void perform_stream_op_locked( } grpc_chttp2_incoming_metadata_live_op_buffer_end( &stream_global->outstanding_metadata); + grpc_chttp2_list_add_read_write_state_changed(transport_global, + stream_global); if (stream_global->id != 0) { - grpc_chttp2_list_add_read_write_state_changed(transport_global, - stream_global); grpc_chttp2_list_add_writable_stream(transport_global, stream_global); } } |