diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:54:23 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:54:23 -0700 |
| commit | cbc4fb9f2e0d6971c93375e6057d1488e8b08f6d (patch) | |
| tree | 1c23d8707036742bda2ec8c3534ccb6729146875 /src/core/channel | |
| parent | e2f2e9a31a39caf56a216db0c53c74a0a52606de (diff) | |
| parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) | |
Merge github.com:grpc/grpc into warbling-wombat
Diffstat (limited to 'src/core/channel')
| -rw-r--r-- | src/core/channel/client_channel.c | 2 | ||||
| -rw-r--r-- | src/core/channel/compress_filter.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 108a6dfdf1..ec6ca42889 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -460,7 +460,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { while (wakeup_closures) { grpc_iomgr_closure *next = wakeup_closures->next; - grpc_iomgr_add_callback(wakeup_closures); + wakeup_closures->cb(wakeup_closures->cb_arg, 1); wakeup_closures = next; } diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index f96a7899d4..9fc8589fbb 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -174,6 +174,8 @@ static void process_send_ops(grpc_call_element *elem, size_t i; int did_compress = 0; + /* In streaming calls, we need to reset the previously accumulated slices */ + gpr_slice_buffer_reset_and_unref(&calld->slices); for (i = 0; i < send_ops->nops; ++i) { grpc_stream_op *sop = &send_ops->ops[i]; switch (sop->type) { |