Avoid multiple slice calls in the WebSocket reader #9636
Merged
Patchback / Backport to 3.10
completed
Nov 3, 2024 in 5s
Backport to 3.10: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply 42a69af on top of patchback/backports/3.10/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636
Details
Backporting merged PR #9636 into master
- Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be yourorigin
remote. - Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the nameupstream
. If you don't
have it, here's how you can add it:$ git remote add upstream https://github.com/aio-libs/aiohttp.git
- 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.10/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636 upstream/3.10
- Now, cherry-pick PR #9636 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x 42a69afc99d94f0aae8f4de69f17cd7332f58ff0
fatal: Commit 42a69afc99d94f0aae8f4de69f17cd7332f58ff0 is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x 42a69afc99d94f0aae8f4de69f17cd7332f58ff0
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #9636 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/3.10/42a69afc99d94f0aae8f4de69f17cd7332f58ff0/pr-9636
- 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!
Loading