Skip to content

Fix UTF-8 encoding for non-ASCII tool names in HTTP client transports #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rameshreddy-adutla wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Fix UTF-8 encoding for non-ASCII tool names in HTTP client transports #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/main/java/io/modelcontextprotocol/client/transport/HttpClientSseClientTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ private Mono<HttpResponse<String>> sendHttpPost(final String endpoint, final Str
return Mono.deferContextual(ctx -> {
var builder = this.requestBuilder.copy()
.uri(requestUri)
.header(HttpHeaders.CONTENT_TYPE, "application/json")
.header(HttpHeaders.CONTENT_TYPE, "application/json; charset=utf-8")
.header(MCP_PROTOCOL_VERSION_HEADER_NAME, MCP_PROTOCOL_VERSION)
.POST(HttpRequest.BodyPublishers.ofString(body));
var transportContext = ctx.getOrDefault(McpTransportContext.KEY, McpTransportContext.EMPTY);
Expand Down
4 changes: 3 additions & 1 deletion ...main/java/io/modelcontextprotocol/client/transport/HttpClientStreamableHttpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ public class HttpClientStreamableHttpTransport implements McpClientTransport {

private static final String APPLICATION_JSON = "application/json";

private static final String APPLICATION_JSON_UTF8 = "application/json; charset=utf-8";

private static final String TEXT_EVENT_STREAM = "text/event-stream";

public static int NOT_FOUND = 404;
Expand Down Expand Up @@ -454,7 +456,7 @@ public Mono<Void> sendMessage(McpSchema.JSONRPCMessage sentMessage) {

var builder = requestBuilder.uri(uri)
.header(HttpHeaders.ACCEPT, APPLICATION_JSON + ", " + TEXT_EVENT_STREAM)
.header(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON)
.header(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON_UTF8)
.header(HttpHeaders.CACHE_CONTROL, "no-cache")
.header(HttpHeaders.PROTOCOL_VERSION,
ctx.getOrDefault(McpAsyncClient.NEGOTIATED_PROTOCOL_VERSION,
Expand Down