diff options
| author |  David G. Quintas <dgq@google.com> | 2017-02-16 12:55:09 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-16 12:55:09 -0800 |
| commit | 1ca0dc2a9b22c144e2a5153394266037e497635e (patch) | |
| tree | 226c3c87758ada18b7754da881286cef14b2c412 /src/core/lib | |
| parent | ca452f432e2ef36592b69f6c35508f5477a4ae19 (diff) | |
| parent | 7317195b8e1e05109ee2e71131e90a90a0a09f40 (diff) | |
Merge pull request #9531 from dgquintas/compression_implicit_encoding
make grpc-encoding:identity implicit
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/channel/compress_filter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/lib/channel/compress_filter.c b/src/core/lib/channel/compress_filter.c index c860d60d88..22781c7839 100644 --- a/src/core/lib/channel/compress_filter.c +++ b/src/core/lib/channel/compress_filter.c @@ -105,7 +105,6 @@ static grpc_error *process_send_initial_metadata( static grpc_error *process_send_initial_metadata( grpc_exec_ctx *exec_ctx, grpc_call_element *elem, grpc_metadata_batch *initial_metadata) { - grpc_error *error; call_data *calld = elem->call_data; channel_data *channeld = elem->channel_data; /* Parse incoming request for compression. If any, it'll be available @@ -144,10 +143,13 @@ static grpc_error *process_send_initial_metadata( calld->has_compression_algorithm = 1; /* GPR_TRUE */ } + grpc_error *error = GRPC_ERROR_NONE; /* hint compression algorithm */ - error = grpc_metadata_batch_add_tail( - exec_ctx, initial_metadata, &calld->compression_algorithm_storage, - grpc_compression_encoding_mdelem(calld->compression_algorithm)); + if (calld->compression_algorithm != GRPC_COMPRESS_NONE) { + error = grpc_metadata_batch_add_tail( + exec_ctx, initial_metadata, &calld->compression_algorithm_storage, + grpc_compression_encoding_mdelem(calld->compression_algorithm)); + } if (error != GRPC_ERROR_NONE) return error; |