Repository navigation
Fix early request cancellation race - #270
Open
dariuscorvus wants to merge 1 commit into
Open
dariuscorvus wants to merge 1 commit into
dariuscorvus wants to merge 1 commit into
Conversation
ianegordon
added a commit
to ianegordon/swift-sdk
that referenced
this pull request
Sep 10, 2026
This was referenced Sep 10, 2026
ianegordon
pushed a commit
to ianegordon/swift-sdk
that referenced
this pull request
Oct 13, 2026
…ests without a reply (upstream modelcontextprotocol#298, EhsanAzish80) Supersedes the contributions of modelcontextprotocol#264, modelcontextprotocol#260 and modelcontextprotocol#270 (manifest entries 1-3), which modelcontextprotocol#298 combines. Conflicts resolved in favour of modelcontextprotocol#298 in HTTPServerTypes.swift, StatelessHTTPServerTransport.swift, Server.swift, CancellationTests.swift and HTTPServerTransportTests.swift. Fork changes re-applied on top: - modelcontextprotocol#258's Server.init description/websiteUrl/icons parameters - modelcontextprotocol#221's MockTransport receiveCallCount / finishStream - entry 1a's collision regression tests and their makeStatelessPOSTRequest authorization overload Behavior: a cancelled original POST now ends as HTTP 200 with an empty text/event-stream and no JSON-RPC body (previously -32002 from modelcontextprotocol#260). Follow-up on when to use -32800: fork issue #41. Full suite: 589 tests in 43 suites passed. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This was referenced Oct 13, 2026
Merged
Contributor
|
Hi @dariuscorvus, thank you for this contribution. We're consolidating overlapping PRs. #298 includes this fix for the early-cancellation race, rebased on current We plan to close this PR once #298 is merged, so the fix isn't lost in between. If you think something here isn't covered by #298, please comment there or here and we'll make sure it's carried over. |
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
notifications/cancelledmessages cannot fall through the registration gapstop()and avoid duplicate built-in cancellation handler registration across restartsTests
DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer swift test --filter CancellationTestsDEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer swift testgit diff --checkMotivation
The receive loop spawns request processing asynchronously. Before this change, a cancellation notification could be consumed before the request's handler task was inserted into
pendingRequestTasks, causing the cancellation to be treated as unknown. A deterministic HTTP-context barrier test now covers that exact ordering.