diff options
| author |  Yang Gao <yangg@google.com> | 2015-08-13 21:34:41 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-08-13 21:34:41 -0700 |
| commit | 0791cf0dcdad6c2a972187dcc9d69dc99adecfbe (patch) | |
| tree | 6510dd82d91bae9dc31a568fb6b587e521d09e96 | |
| parent | 685674c554dab842c6797057e1b656b5c004dda1 (diff) | |
| parent | cddd95bfd8fa0d701bdf529e94be3dd76a189764 (diff) | |
Merge pull request #2931 from dgquintas/none-to-identity
Renamed "none" as "identity" for the no-op compression algorithm
| -rw-r--r-- | src/core/compression/algorithm.c | 4 | ||||
| -rw-r--r-- | test/core/end2end/tests/request_with_compressed_payload.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/compression/algorithm.c b/src/core/compression/algorithm.c index e426241d0a..0fd028741e 100644 --- a/src/core/compression/algorithm.c +++ b/src/core/compression/algorithm.c @@ -37,7 +37,7 @@ int grpc_compression_algorithm_parse(const char* name, grpc_compression_algorithm *algorithm) { - if (strcmp(name, "none") == 0) { + if (strcmp(name, "identity") == 0) { *algorithm = GRPC_COMPRESS_NONE; } else if (strcmp(name, "gzip") == 0) { *algorithm = GRPC_COMPRESS_GZIP; @@ -53,7 +53,7 @@ int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm, char **name) { switch (algorithm) { case GRPC_COMPRESS_NONE: - *name = "none"; + *name = "identity"; break; case GRPC_COMPRESS_DEFLATE: *name = "deflate"; diff --git a/test/core/end2end/tests/request_with_compressed_payload.c b/test/core/end2end/tests/request_with_compressed_payload.c index e749988518..6a067d8d1d 100644 --- a/test/core/end2end/tests/request_with_compressed_payload.c +++ b/test/core/end2end/tests/request_with_compressed_payload.c @@ -300,12 +300,12 @@ static void test_invoke_request_with_compressed_payload_md_override( sizeof(gzip_compression_override.internal_data)); none_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY; - none_compression_override.value = "none"; + none_compression_override.value = "identity"; none_compression_override.value_length = 4; memset(&none_compression_override.internal_data, 0, sizeof(none_compression_override.internal_data)); - /* Channel default NONE, call override to GZIP */ + /* Channel default NONE (aka IDENTITY), call override to GZIP */ request_with_payload_template( config, "test_invoke_request_with_compressed_payload_md_override_1", 0, GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override); @@ -315,7 +315,7 @@ static void test_invoke_request_with_compressed_payload_md_override( config, "test_invoke_request_with_compressed_payload_md_override_2", 0, GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override); - /* Channel default DEFLATE, call override to NONE */ + /* Channel default DEFLATE, call override to NONE (aka IDENTITY) */ request_with_payload_template( config, "test_invoke_request_with_compressed_payload_md_override_3", 0, GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override); |