From 410c22b30e71265cb5a0cfe69f5e80391393b946 Mon Sep 17 00:00:00 2001
From: Alexi Christakis <167903946+alexi-openai@users.noreply.github.com>
Date: Wed, 29 Jul 2026 23:42:03 +0000
Subject: [PATCH] Extract MCP environment headers into a local variable
 (#36047)

GitOrigin-RevId: 1372756e47133f49e64c5308624dc8685c282efb
---
 codex-rs/codex-mcp/src/mcp/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/codex-rs/codex-mcp/src/mcp/mod.rs b/codex-rs/codex-mcp/src/mcp/mod.rs
index b8422e1e74..9dadc8fea0 100644
--- a/codex-rs/codex-mcp/src/mcp/mod.rs
+++ b/codex-rs/codex-mcp/src/mcp/mod.rs
@@ -526,13 +526,14 @@ fn mcp_server_config_for_url(
     if let Some(originator) = originator {
         http_headers.insert("originator".to_string(), originator.to_string());
     }
+    let env_http_headers = None;
 
     McpServerConfig {
         transport: McpServerTransportConfig::StreamableHttp {
             url,
             bearer_token_env_var: codex_apps_mcp_bearer_token_env_var(),
             http_headers: Some(http_headers),
-            env_http_headers: None,
+            env_http_headers,
         },
         auth: auth_mode,
         environment_id: codex_config::DEFAULT_MCP_SERVER_ENVIRONMENT_ID.to_string(),