Skip to content

Fix windows not working with wait read socket stm#1077

Merged
Vlix merged 5 commits into
masterfrom
fix-windows-not-working-with-waitReadSocketSTM
May 28, 2026
Merged

Fix windows not working with wait read socket stm#1077
Vlix merged 5 commits into
masterfrom
fix-windows-not-working-with-waitReadSocketSTM

Conversation

@Vlix
Copy link
Copy Markdown
Contributor

@Vlix Vlix commented May 25, 2026

Before submitting your PR, check that you've:

  • Bumped the version number

After submitting your PR:

  • Update the Changelog.md file with a link to your PR
  • Check that CI passes (or if it fails, for reasons unrelated to your change, like CI timeouts)

Patch to hopefully build with Windows again. Fixing #1073
@sheaf: could you test Windows functionality with this code?

@Vlix Vlix requested a review from kazu-yamamoto May 25, 2026 16:14
@Vlix Vlix force-pushed the fix-windows-not-working-with-waitReadSocketSTM branch from 0857272 to 998a83b Compare May 25, 2026 16:15
Vlix added 2 commits May 25, 2026 18:56
…sn't actually different in code, except that it hopefully works on Windows again
@Vlix Vlix force-pushed the fix-windows-not-working-with-waitReadSocketSTM branch from 998a83b to 16c1541 Compare May 25, 2026 16:57
@kazu-yamamoto
Copy link
Copy Markdown
Contributor

Looks a nice idea to me.
I'm waiting for the result of @sheaf's testing.

Comment thread warp/Network/Wai/Handler/Warp/Run.hs Outdated
makeGracefulRecv sock pool ss appsInProgress = do
sockWait <- waitReadSocketSTM sock
sockWait <-
#if !WINDOWS
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Shall I change this to the following?

#if !WINDOWS && MIN_VERSION_network(3,2,2)

Copy link
Copy Markdown
Contributor Author

@Vlix Vlix May 27, 2026

Choose a reason for hiding this comment

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

@kazu-yamamoto Added in new commits, and I checked that without it it indeed fails to build with network-3.2.1.0.
LTS-20/21 in CI will check that it works with network < 3.2.2

EDIT: Whoops, warp-quic won't build with network-3.2.1.0... so we'll have to leave it as is in the CI. But I did check and warp itself builds with network < 3.2.2 now.

@Vlix Vlix force-pushed the fix-windows-not-working-with-waitReadSocketSTM branch from 05e9e49 to 7c14d47 Compare May 27, 2026 09:31
Copy link
Copy Markdown
Contributor

@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.

LGTM.
@Vlix Please merge this PR by yourself and release a new version if you wish.

@Vlix Vlix merged commit 8573a70 into master May 28, 2026
18 checks passed
@Vlix Vlix deleted the fix-windows-not-working-with-waitReadSocketSTM branch May 28, 2026 12:16
@Vlix
Copy link
Copy Markdown
Contributor Author

Vlix commented May 28, 2026

Published new patch version warp-3.4.13.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants