diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-26 09:54:53 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-26 09:54:53 -0700 |
| commit | f467846b1b6910c2fe6cf5c9802baafd3deb5186 (patch) | |
| tree | 237ce082751d4288d7a5f712fdea3a149f6ede58 /src/core/ext | |
| parent | d82a5b66c78a620dc59807a83a86a1a98071f5b7 (diff) | |
| parent | 52227906e6621c36af958e6e1cd810f4fb7b7602 (diff) | |
Merge github.com:grpc/grpc into reuse_port
Diffstat (limited to 'src/core/ext')
| -rw-r--r-- | src/core/ext/client_config/channel_connectivity.c | 7 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/chttp2_transport.c | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/core/ext/client_config/channel_connectivity.c b/src/core/ext/client_config/channel_connectivity.c index 20c01a9a7c..c1220e3a8c 100644 --- a/src/core/ext/client_config/channel_connectivity.c +++ b/src/core/ext/client_config/channel_connectivity.c @@ -189,10 +189,11 @@ void grpc_channel_watch_connectivity_state( GRPC_API_TRACE( "grpc_channel_watch_connectivity_state(" "channel=%p, last_observed_state=%d, " - "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " + "deadline=gpr_timespec { tv_sec: %" PRId64 + ", tv_nsec: %d, clock_type: %d }, " "cq=%p, tag=%p)", - 7, (channel, (int)last_observed_state, (long long)deadline.tv_sec, - (int)deadline.tv_nsec, (int)deadline.clock_type, cq, tag)); + 7, (channel, (int)last_observed_state, deadline.tv_sec, deadline.tv_nsec, + (int)deadline.clock_type, cq, tag)); grpc_cq_begin_op(cq, tag); diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c index 9c99ff883a..9c125566d4 100644 --- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c +++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c @@ -1557,17 +1557,15 @@ static void close_from_api(grpc_exec_ctx *exec_ctx, gpr_slice_buffer_add(&transport_global->qbuf, gpr_slice_ref(*optional_message)); } - gpr_slice_buffer_add( &transport_global->qbuf, grpc_chttp2_rst_stream_create(stream_global->id, GRPC_CHTTP2_NO_ERROR, &stream_global->stats.outgoing)); - - if (optional_message) { - gpr_slice_ref(*optional_message); - } } + if (optional_message) { + gpr_slice_ref(*optional_message); + } grpc_chttp2_fake_status(exec_ctx, transport_global, stream_global, status, optional_message); grpc_error *err = GRPC_ERROR_CREATE("Stream closed"); |