Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions lib/mcp/server/transports/streamable_http_transport.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1883,10 +1883,10 @@ def validate_accept_header(request, required_types)
nil
end

# Empty list members (`application/json,,text/event-stream`), which RFC 9110 section 5.6.1.2 has
# a recipient parse and ignore, are skipped.
def parse_accept_header(header)
header.split(",").map do |part|
part.split(";").first.strip.downcase
end
header.split(",").map { |part| part.split(";").first.to_s.strip.downcase }.reject(&:empty?)
end

def validate_content_type(request)
Expand Down
41 changes: 41 additions & 0 deletions test/mcp/server/transports/streamable_http_transport_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1756,6 +1756,23 @@ def string
assert_equal 200, response[0]
end

test "POST request with empty members in the Accept header succeeds" do
["application/json,,text/event-stream", ", application/json, text/event-stream"].each do |accept|
request = create_rack_request_without_accept(
"POST",
"/",
{
"CONTENT_TYPE" => "application/json",
"HTTP_ACCEPT" => accept,
},
{ jsonrpc: "2.0", method: "initialize", id: "123", params: initialize_params }.to_json,
)

response = @transport.handle_request(request)
assert_equal 200, response[0], accept.inspect
end
end

test "POST request with Accept: */* succeeds" do
request = create_rack_request_without_accept(
"POST",
Expand Down Expand Up @@ -1886,6 +1903,30 @@ def string
assert_equal "text/event-stream", response[1]["content-type"]
end

test "GET request with an empty member in the Accept header succeeds" do
init_request = create_rack_request(
"POST",
"/",
{ "CONTENT_TYPE" => "application/json" },
{ jsonrpc: "2.0", method: "initialize", id: "123", params: initialize_params }.to_json,
)
init_response = @transport.handle_request(init_request)
session_id = init_response[1]["mcp-session-id"]

request = create_rack_request(
"GET",
"/",
{
"HTTP_MCP_SESSION_ID" => session_id,
"HTTP_ACCEPT" => ",text/event-stream",
},
)

response = @transport.handle_request(request)
assert_equal 200, response[0]
assert_equal "text/event-stream", response[1]["content-type"]
end

test "GET request with Accept: */* succeeds" do
init_request = create_rack_request(
"POST",
Expand Down
Loading