Skip to content
Snippets Groups Projects
Commit 077da7fa authored by Craig Tiller's avatar Craig Tiller
Browse files

Fix merge error

parent d57a1487
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <string.h> #include <string.h>
#include "src/core/lib/profiling/timers.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" #include "src/core/lib/transport/static_metadata.h"
#define EXPECTED_CONTENT_TYPE "application/grpc" #define EXPECTED_CONTENT_TYPE "application/grpc"
...@@ -90,10 +90,10 @@ typedef struct { ...@@ -90,10 +90,10 @@ typedef struct {
static grpc_mdelem *server_filter_outgoing_metadata(void *user_data, static grpc_mdelem *server_filter_outgoing_metadata(void *user_data,
grpc_mdelem *md) { grpc_mdelem *md) {
if (md->key == GRPC_MDSTR_GRPC_MESSAGE) { if (md->key == GRPC_MDSTR_GRPC_MESSAGE) {
gpr_slice pct_encoded_msg = gpr_percent_encode_slice( grpc_slice pct_encoded_msg = grpc_percent_encode_slice(
md->value->slice, gpr_compatible_percent_encoding_unreserved_bytes); md->value->slice, grpc_compatible_percent_encoding_unreserved_bytes);
if (gpr_slice_is_equivalent(pct_encoded_msg, md->value->slice)) { if (grpc_slice_is_equivalent(pct_encoded_msg, md->value->slice)) {
gpr_slice_unref(pct_encoded_msg); grpc_slice_unref(pct_encoded_msg);
return md; return md;
} else { } else {
return grpc_mdelem_from_metadata_strings( return grpc_mdelem_from_metadata_strings(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment