Skip to content
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.

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

KTOR-5199 Support WebSockets in Curl engine #4656

Merged
merged 14 commits into from
Feb 10, 2025
Merged

Conversation

whyoleg
Copy link
Contributor

@whyoleg whyoleg commented Feb 7, 2025

Reopens #3950 rebased on latest main with small fixes:

  • drop check for ws protocol as we now have static linking with ws enabled by default
  • drop runBlocking in one place reverted in 66eb2e7 as it's caused test failures

Note: for some reason we doesn't get a response when empty frame is sent, so I've ignored test for now:
e729516#diff-109d21786a3c9fc1fa41ca37d161e2099fc7091eee7a13f8e1627df3ba1c391dR39
Not sure if it's a curl issue - need to be investigated

Note2: commit 6438787 was mostly reverted as it was causing failures in http timeout tests

@e5l
Copy link
Member

e5l commented Feb 7, 2025

@whyoleg, could you check the CI?

@e5l
Copy link
Member

e5l commented Feb 7, 2025

looks like flaky, restarted

@e5l e5l enabled auto-merge (squash) February 7, 2025 17:49
e5l and others added 3 commits February 7, 2025 18:49
auto-merge was automatically disabled February 8, 2025 06:26

Head branch was pushed to by a user without write access

@whyoleg
Copy link
Contributor Author

whyoleg commented Feb 8, 2025

I've reverted additional commit which drops runBlocking usage (9371439) - that was the case of test failure.
Now, after several re-runs of CI (because of flaky tests) all checks are green!

@whyoleg whyoleg requested a review from e5l February 8, 2025 11:20
Copy link
Member

@osipxd osipxd left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you for reopening this PR!
Only one minor comment

@osipxd osipxd enabled auto-merge (squash) February 10, 2025 08:02
@osipxd osipxd disabled auto-merge February 10, 2025 08:02
@e5l e5l enabled auto-merge (squash) February 10, 2025 08:03
@e5l e5l merged commit 0828cbf into ktorio:main Feb 10, 2025
14 of 16 checks passed
@whyoleg whyoleg deleted the whyoleg/curl-ws branch February 11, 2025 14:02
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.

None yet

4 participants