diff options
author | Craig Tiller <ctiller@google.com> | 2016-11-16 14:55:44 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-11-16 14:55:44 -0800 |
commit | 077da7fa318df97db196621740629e5b910bb325 (patch) | |
tree | 473c1d7ac709c126a24d40e864e741c7a3db1936 /src | |
parent | d57a1487b17a2fb7251cc575dd7161ae6c1bea13 (diff) |
Fix merge error
Diffstat (limited to 'src')
-rw-r--r-- | src/core/lib/channel/http_server_filter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/lib/channel/http_server_filter.c b/src/core/lib/channel/http_server_filter.c index 80f3fc3cc3..b42ff06039 100644 --- a/src/core/lib/channel/http_server_filter.c +++ b/src/core/lib/channel/http_server_filter.c @@ -37,7 +37,7 @@ #include <grpc/support/log.h> #include <string.h> #include "src/core/lib/profiling/timers.h" -#include "src/core/lib/support/percent_encoding.h" +#include "src/core/lib/slice/percent_encoding.h" #include "src/core/lib/transport/static_metadata.h" #define EXPECTED_CONTENT_TYPE "application/grpc" @@ -90,10 +90,10 @@ typedef struct { static grpc_mdelem *server_filter_outgoing_metadata(void *user_data, grpc_mdelem *md) { if (md->key == GRPC_MDSTR_GRPC_MESSAGE) { - gpr_slice pct_encoded_msg = gpr_percent_encode_slice( - md->value->slice, gpr_compatible_percent_encoding_unreserved_bytes); - if (gpr_slice_is_equivalent(pct_encoded_msg, md->value->slice)) { - gpr_slice_unref(pct_encoded_msg); + grpc_slice pct_encoded_msg = grpc_percent_encode_slice( + md->value->slice, grpc_compatible_percent_encoding_unreserved_bytes); + if (grpc_slice_is_equivalent(pct_encoded_msg, md->value->slice)) { + grpc_slice_unref(pct_encoded_msg); return md; } else { return grpc_mdelem_from_metadata_strings( |