Set content type. See #10959

grpc · Mar 16, 2024 · 20b2d39 · 20b2d39
1 parent 053ab0f
commit 20b2d39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/netty/src/main/java/io/grpc/netty/Utils.java b/netty/src/main/java/io/grpc/netty/Utils.java
@@ -229,7 +229,6 @@ public static Http2Headers convertClientHeaders(Metadata headers,
     Preconditions.checkNotNull(method, "method");
 
     // Discard any application supplied duplicates of the reserved headers
-    headers.discardAll(CONTENT_TYPE_KEY);
     headers.discardAll(GrpcUtil.TE_HEADER);
     headers.discardAll(GrpcUtil.USER_AGENT_KEY);
 
@@ -244,7 +243,6 @@ public static Http2Headers convertClientHeaders(Metadata headers,
 
   public static Http2Headers convertServerHeaders(Metadata headers) {
     // Discard any application supplied duplicates of the reserved headers
-    headers.discardAll(CONTENT_TYPE_KEY);
     headers.discardAll(GrpcUtil.TE_HEADER);
     headers.discardAll(GrpcUtil.USER_AGENT_KEY);
 

diff --git a/netty/src/test/java/io/grpc/clientchannel/ClientChannelService.java b/netty/src/test/java/io/grpc/clientchannel/ClientChannelService.java
@@ -15,6 +15,8 @@
 
 public abstract class ClientChannelService implements BindableService {
 
+    public static final Metadata.Key<String> CONTENT_TYPE_KEY = Metadata.Key.of("content-type", Metadata.ASCII_STRING_MARSHALLER);
+
     static String TUNNEL_SERVICE = "io.grpc.Tunnel";
 
     static MethodDescriptor<ByteBuf, ByteBuf> NEW_TUNNEL_METHOD = MethodDescriptor
@@ -62,6 +64,8 @@ protected void doBeginRead() {
                 throw new RuntimeException(e);
             }
 
+            headers.put(CONTENT_TYPE_KEY, "application/grpc+raw");
+
             serverCall.start(
                     new ClientCall.Listener<ByteBuf>() {