aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-07-01 06:54:50 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-07-01 06:54:50 -0700
commitf1b8512a759d249f0b756c4ab597eeac3c47bfe5 (patch)
tree5212d128d5afb034c9df4475d88a7f83e258d9b5
parentcdbdbc027a3676f3674886e6290fd00a4f73f943 (diff)
parent23ca82ab54e0f5386c1a6b9233e6864121415280 (diff)
Merge github.com:grpc/grpc into tis-but-thy-name
-rw-r--r--src/core/transport/chttp2_transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/transport/chttp2_transport.c b/src/core/transport/chttp2_transport.c
index 98cb5203d0..4bcb317fe7 100644
--- a/src/core/transport/chttp2_transport.c
+++ b/src/core/transport/chttp2_transport.c
@@ -403,6 +403,7 @@ static void destroy_stream(grpc_transport *gt, grpc_stream *gs) {
GPR_ASSERT(s->global.outgoing_sopb == NULL);
GPR_ASSERT(s->global.publish_sopb == NULL);
grpc_sopb_destroy(&s->writing.sopb);
+ grpc_sopb_destroy(&s->global.incoming_sopb);
grpc_chttp2_data_parser_destroy(&s->parsing.data_parser);
grpc_chttp2_incoming_metadata_buffer_destroy(&s->parsing.incoming_metadata);
grpc_chttp2_incoming_metadata_buffer_destroy(&s->global.incoming_metadata);
@@ -940,7 +941,6 @@ static void recv_data(void *tp, gpr_slice *slices, size_t nslices,
static void reading_action(void *pt, int iomgr_success_ignored) {
grpc_chttp2_transport *t = pt;
- gpr_log(GPR_DEBUG, "reading_action");
grpc_endpoint_notify_on_read(t->ep, recv_data, t);
}