diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-04-29 21:51:31 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-29 21:51:31 -0700 |
| commit | 93e4a386a54a90df51f551944e04ad8e62576fab (patch) | |
| tree | 9b8e72312002863e73433015dcd0378340959c7c /src/core/transport/chttp2/stream_encoder.c | |
| parent | 7d9df1b23a456ad4e7b9d665d8acd2ab81f8e4cd (diff) | |
| parent | 1685d773ef81420bf747c6988a2ad9baefd126fa (diff) | |
Merge github.com:grpc/grpc into travvy
Conflicts:
.travis.yml
Diffstat (limited to 'src/core/transport/chttp2/stream_encoder.c')
| -rw-r--r-- | src/core/transport/chttp2/stream_encoder.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/transport/chttp2/stream_encoder.c b/src/core/transport/chttp2/stream_encoder.c index 5ca31d6bc7..cf1e66bf8b 100644 --- a/src/core/transport/chttp2/stream_encoder.c +++ b/src/core/transport/chttp2/stream_encoder.c @@ -481,7 +481,6 @@ gpr_uint32 grpc_chttp2_preencode(grpc_stream_op *inops, size_t *inops_count, break; case GRPC_OP_METADATA: grpc_metadata_batch_assert_ok(&op->data.metadata); - case GRPC_OP_FLOW_CTL_CB: /* these just get copied as they don't impact the number of flow controlled bytes */ grpc_sopb_append(outops, op, 1); @@ -567,10 +566,6 @@ void grpc_chttp2_encode(grpc_stream_op *ops, size_t ops_count, int eof, GPR_ERROR, "These stream ops should be filtered out by grpc_chttp2_preencode"); abort(); - case GRPC_OP_FLOW_CTL_CB: - op->data.flow_ctl_cb.cb(op->data.flow_ctl_cb.arg, GRPC_OP_OK); - curop++; - break; case GRPC_OP_METADATA: /* Encode a metadata batch; store the returned values, representing a metadata element that needs to be unreffed back into the metadata |