fix: consume response body on unexpected content type to prevent client hang#2438
Open
vishal-vanam wants to merge 3 commits intomodelcontextprotocol:mainfrom
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #2432
When an MCP server returns an unexpected
Content-Type(e.g.text/plaininstead ofapplication/jsonortext/event-stream),session.initialize()hangs indefinitely because the response body is never consumed, causing the httpx streaming context to block on exit.The fix: Call
await response.aread()to consume the response body before sending the error message through the read stream. This allows the streaming context to close cleanly and the error to propagate to the caller.Changes
src/mcp/client/streamable_http.py: Addedawait response.aread()in the unexpected content-type branch to drain the response bodytests/shared/test_streamable_http.py: Added test using httpx MockTransport to verify the client raisesMCPErrorinstead of hangingTest plan
test_unexpected_content_type_does_not_hangpasses locally