Skip to content

[3.0.x] switch away from deprecated UpgradeToWebSocket (backport #13763) by @pjfanning#13894

Merged
mkurz merged 1 commit into
3.0.xfrom
mergify/bp/3.0.x/pr-13763
Apr 22, 2026
Merged

[3.0.x] switch away from deprecated UpgradeToWebSocket (backport #13763) by @pjfanning#13894
mkurz merged 1 commit into
3.0.xfrom
mergify/bp/3.0.x/pr-13763

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 22, 2026

Pull Request Checklist

Helpful things

Fixes

Fixes #13744

Purpose

What does this PR do?

Background Context

Why did you take this approach?

References

Are there any relevant issues / PRs / mailing lists discussions?


This is an automatic backport of pull request #13763 done by [Mergify](https://mergify.com).

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 22, 2026

Merge Queue Status

  • Entered queue2026-04-22 11:12 UTC · Rule: default
  • Checks skipped · PR is already up-to-date
  • Merged2026-04-22 11:15 UTC · at f0066d2da02c7cb834a71b6ac53fce6b5ddf50ea · merge

This pull request spent 3 minutes 8 seconds in the queue, including 1 second running CI.

Required conditions to merge

mergify Bot added a commit that referenced this pull request Apr 22, 2026
@mkurz mkurz merged commit 3060ab4 into 3.0.x Apr 22, 2026
27 of 28 checks passed
@mkurz mkurz deleted the mergify/bp/3.0.x/pr-13763 branch April 22, 2026 11:15
@mkurz
Copy link
Copy Markdown
Member

mkurz commented May 6, 2026

@Mergifyio backport 2.9.x

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented May 6, 2026

backport 2.9.x

✅ Backports have been created

Details

Cherry-pick of f0066d2 has failed:

On branch mergify/bp/2.9.x/pr-13894
Your branch is up to date with 'origin/2.9.x'.

You are currently cherry-picking commit f0066d2da.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   transport/server/play-akka-http-server/src/main/scala/akka/http/play/WebSocketHandler.scala
	both modified:   transport/server/play-akka-http-server/src/main/scala/play/core/server/AkkaHttpServer.scala

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

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