From 7d1ee908419f4763f7855a9d6a8bf5251ce8c2e0 Mon Sep 17 00:00:00 2001
From: Harshit Jain <48647625+Harshit28j@users.noreply.github.com>
Date: Sat, 21 Mar 2026 00:20:59 +0530
Subject: [PATCH] Update litellm/proxy/_experimental/mcp_server/server.py

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
---
 litellm/proxy/_experimental/mcp_server/server.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/litellm/proxy/_experimental/mcp_server/server.py b/litellm/proxy/_experimental/mcp_server/server.py
index 9c91d364d59..85574bd506d 100644
--- a/litellm/proxy/_experimental/mcp_server/server.py
+++ b/litellm/proxy/_experimental/mcp_server/server.py
@@ -382,10 +382,14 @@ if MCP_AVAILABLE:
                 (b"content-type", b"application/json"),
             ]
             if raw_headers:
-                for k, v in raw_headers.items():
+                try:
                     _scope_headers.append(
                         (k.lower().encode("latin-1"), v.encode("latin-1"))
                     )
+                except (UnicodeEncodeError, UnicodeDecodeError):
+                    verbose_logger.debug(
+                        f"Skipping header {k!r}: contains non-Latin-1 characters"
+                    )
             request = Request(
                 scope={
                     "type": "http",