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

Don't listen on TCP when only path is passed #9033

Merged
merged 7 commits into from
Sep 22, 2024
Merged

Don't listen on TCP when only path is passed #9033

merged 7 commits into from
Sep 22, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #8205.

@Dreamsorcerer Dreamsorcerer added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Sep 5, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 5, 2024
Copy link

codecov bot commented Sep 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.30%. Comparing base (e8d8e28) to head (962be9d).
Report is 1125 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9033   +/-   ##
=======================================
  Coverage   98.30%   98.30%           
=======================================
  Files         107      107           
  Lines       34355    34377   +22     
  Branches     4066     4071    +5     
=======================================
+ Hits        33771    33793   +22     
  Misses        412      412           
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.19% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.85% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.22% <39.13%> (-0.04%) ⬇️
OS-macOS 97.53% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.63% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.56% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.79% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.91% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.52% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.46% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.07% <100.00%> (+<0.01%) ⬆️
VM-macos 97.53% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.85% <100.00%> (+<0.01%) ⬆️
VM-windows 96.22% <39.13%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bdraco bdraco merged commit d0e60d5 into master Sep 22, 2024
34 of 35 checks passed
@bdraco bdraco deleted the path-no-host branch September 22, 2024 16:01
Copy link
Contributor

patchback bot commented Sep 22, 2024

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

❌ Failed to cleanly apply d0e60d5 on top of patchback/backports/3.11/d0e60d59d00d394193c8b40ac746146e094d5fb9/pr-9033

Backporting merged PR #9033 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.11/d0e60d59d00d394193c8b40ac746146e094d5fb9/pr-9033 upstream/3.11
  4. Now, cherry-pick PR Don't listen on TCP when only path is passed #9033 contents into that branch:
    $ git cherry-pick -x d0e60d59d00d394193c8b40ac746146e094d5fb9
    If it'll yell at you with something like fatal: Commit d0e60d59d00d394193c8b40ac746146e094d5fb9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d0e60d59d00d394193c8b40ac746146e094d5fb9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Don't listen on TCP when only path is passed #9033 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/d0e60d59d00d394193c8b40ac746146e094d5fb9/pr-9033
  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 pushed a commit that referenced this pull request Sep 22, 2024
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
(cherry picked from commit d0e60d5)
@bdraco
Copy link
Member

bdraco commented Sep 22, 2024

3.11 #9233

Dreamsorcerer added a commit that referenced this pull request Sep 22, 2024
…is passed (#9233)

Co-authored-by: Sam Bull <git@sambull.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aiohttp.web listens both TCP and Unix socket if -U has been supplied
2 participants