Skip to content

Add masked WebSocket read benchmarks and fix read benchmark backpressure - #13561

Merged
bdraco merged 2 commits into
masterfrom
masked-ws-read-benchmarks
Aug 28, 2026
Merged

Add masked WebSocket read benchmarks and fix read benchmark backpressure#13561
bdraco merged 2 commits into
masterfrom
masked-ws-read-benchmarks

Add news fragment for benchmark changes

a82fe05
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 3.15 completed Aug 28, 2026 in 7s

Backport to 3.15: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 148205f on top of patchback/backports/3.15/148205f2fdc477ad3e4de0439d817b2a495ccf1e/pr-13561

Details

Backporting merged PR #13561 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.15/148205f2fdc477ad3e4de0439d817b2a495ccf1e/pr-13561 upstream/3.15
  4. Now, cherry-pick PR #13561 contents into that branch:
    $ git cherry-pick -x 148205f2fdc477ad3e4de0439d817b2a495ccf1e
    If it'll yell at you with something like fatal: Commit 148205f2fdc477ad3e4de0439d817b2a495ccf1e is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 148205f2fdc477ad3e4de0439d817b2a495ccf1e
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR #13561 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.15/148205f2fdc477ad3e4de0439d817b2a495ccf1e/pr-13561
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!