Skip to content

Fix UserTimeout on macos #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
kazu-yamamoto merged 1 commit into from
Jan 14, 2025
Merged

Fix UserTimeout on macos #599

kazu-yamamoto merged 1 commit into from
Jan 14, 2025
+2 −0

Conversation

@sirhcm
Copy link
Contributor

@sirhcm sirhcm commented Jan 13, 2025

Uses TCP_CONNECTIONTIMEOUT if TCP_USER_TIMEOUT cannot be found.

@kazu-yamamoto kazu-yamamoto self-assigned this Jan 14, 2025
@kazu-yamamoto kazu-yamamoto self-requested a review January 14, 2025 05:54
kazu-yamamoto
kazu-yamamoto approved these changes Jan 14, 2025
View reviewed changes
Copy link
Collaborator

@kazu-yamamoto kazu-yamamoto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

@kazu-yamamoto kazu-yamamoto merged commit 412cb41 into haskell:master Jan 14, 2025
10 checks passed
@kazu-yamamoto
Copy link
Collaborator

kazu-yamamoto commented Jan 14, 2025

I have merged this PR.
Thanks you for your contribution!

@sirhcm sirhcm deleted the mac-timeout branch January 14, 2025 18:46
@sirhcm
Copy link
Contributor Author

sirhcm commented Jan 17, 2025

In retrospect, this probably should be a new SocketOption. TCP_USER_TIMEOUT is measured in milliseconds, but TCP_CONNECTIONTIMEOUT is measured in seconds. TCP_CONNECTIONTIMEOUT seems like it instead should be the macos version of FreeBSD's TCP_KEEPINIT.

@sirhcm sirhcm mentioned this pull request Jan 17, 2025
Merged
kazu-yamamoto added a commit that referenced this pull request Jan 28, 2025
@kazu-yamamoto
Merge pull request #600 from christopherm99/mac-timeout-2
c00be44 
Revert #599 and add new SocketOption `KeepInit`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kazu-yamamoto kazu-yamamoto kazu-yamamoto approved these changes

Assignees

@kazu-yamamoto kazu-yamamoto

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sirhcm @kazu-yamamoto