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

Fix CONNECT always being treated as having an empty body #7772

Merged
merged 3 commits into from
Oct 31, 2023

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 31, 2023

What do these changes do?

CONNECT will only have an empty body on 2xx

fixes a mistake in #7755

Are there changes in behavior for the user?

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

CONNECT will only have an empty body on 200

fixes a mistake in aio-libs#7755
@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.9 labels Oct 31, 2023
@bdraco
Copy link
Member Author

bdraco commented Oct 31, 2023

I was looking at what it would take to write an end to end test for this, but it looks like there isn't anything for connect besides the http parser (test_url_connect)

I think the best option right now is a unit for the helper

@bdraco bdraco marked this pull request as ready for review October 31, 2023 17:03
@bdraco bdraco requested a review from asvetlov as a code owner October 31, 2023 17:03
@bdraco
Copy link
Member Author

bdraco commented Oct 31, 2023

test failures are unrelated

started working through them

#7773

@Dreamsorcerer Dreamsorcerer merged commit af2bb1e into aio-libs:master Oct 31, 2023
28 of 33 checks passed
Copy link
Contributor

patchback bot commented Oct 31, 2023

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

❌ Failed to cleanly apply af2bb1e on top of patchback/backports/3.9/af2bb1e7ad2e07948b02af0a2db55d5f8555ef6b/pr-7772

Backporting merged PR #7772 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.9/af2bb1e7ad2e07948b02af0a2db55d5f8555ef6b/pr-7772 upstream/3.9
  4. Now, cherry-pick PR Fix CONNECT always being treated as having an empty body #7772 contents into that branch:
    $ git cherry-pick -x af2bb1e7ad2e07948b02af0a2db55d5f8555ef6b
    If it'll yell at you with something like fatal: Commit af2bb1e7ad2e07948b02af0a2db55d5f8555ef6b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x af2bb1e7ad2e07948b02af0a2db55d5f8555ef6b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix CONNECT always being treated as having an empty body #7772 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/af2bb1e7ad2e07948b02af0a2db55d5f8555ef6b/pr-7772
  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!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

bdraco added a commit to bdraco/aiohttp that referenced this pull request Oct 31, 2023
Dreamsorcerer pushed a commit that referenced this pull request Oct 31, 2023
xiangxli pushed a commit to xiangxli/aiohttp that referenced this pull request Dec 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants