Repository navigation
Keep macOS proxy tunnels blocking after accept - #1320
Merged
Merged
Conversation
macOS accepted sockets inherit the listener's O_NONBLOCK, so the relay's first read with nothing waiting failed with WouldBlock and half-closed the upstream. The tunnel test now pauses before the client sends, as an idle tunnel does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LSAzXiA6BD9neiPgVQRMKD
JacobStephens2
added
the
test:macos
Merged
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.
main's push CI on #1316's merge failed on macOS inproxy::tests::an_allowed_host_is_reached_through_the_proxy: the provider read EOF instead ofrequest.On macOS, as on other BSDs, a socket from
accept()inherits the listener'sO_NONBLOCK. Linux doesn't do this. The Trial proxy's listener is non-blocking so it can watch for shutdown, so on macOS every tunnel's client socket was non-blocking too. If the client wasn't sending at the moment the relay read,io::copygotWouldBlock, gave up, and half-closed the upstream. The test passed whenever the client won that race. A real macOS Trial would lose its tunnel at the first idle moment.servemakes each accepted stream blocking before handing it off.Part of #1315.
🤖 Generated with Claude Code
https://claude.ai/code/session_01LSAzXiA6BD9neiPgVQRMKD