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

Avoid compressing empty body #9108

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Avoid compressing empty body #9108

merged 3 commits into from
Sep 10, 2024

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Sep 10, 2024

Overrule the compress setting if the body is empty, as the user is unlikely to have wanted to send a compressed body.

Fixes #3413.
Closes #8928.

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

codecov bot commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.30%. Comparing base (ffcf9dc) to head (9a3c5c7).
Report is 4 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9108   +/-   ##
=======================================
  Coverage   98.30%   98.30%           
=======================================
  Files         107      107           
  Lines       34403    34427   +24     
  Branches     4081     4085    +4     
=======================================
+ Hits        33819    33844   +25     
+ Misses        412      411    -1     
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.20% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.86% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.27% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.54% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.63% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.57% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.80% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.92% <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.08% <100.00%> (+<0.01%) ⬆️
VM-macos 97.54% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.86% <100.00%> (+<0.01%) ⬆️
VM-windows 96.27% <100.00%> (+<0.01%) ⬆️

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.

@Dreamsorcerer Dreamsorcerer merged commit 1d11241 into master Sep 10, 2024
35 of 36 checks passed
@Dreamsorcerer Dreamsorcerer deleted the fix-compress-empty-body branch September 10, 2024 13:32
Copy link
Contributor

patchback bot commented Sep 10, 2024

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

❌ Failed to cleanly apply 1d11241 on top of patchback/backports/3.10/1d112418a05dcdcabd38590351e78bec8f4a45bc/pr-9108

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

Copy link
Contributor

patchback bot commented Sep 10, 2024

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

❌ Failed to cleanly apply 1d11241 on top of patchback/backports/3.11/1d112418a05dcdcabd38590351e78bec8f4a45bc/pr-9108

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

Dreamsorcerer added a commit that referenced this pull request Sep 10, 2024
(cherry picked from commit 1d11241)
@Dreamsorcerer Dreamsorcerer mentioned this pull request Sep 10, 2024
5 tasks
Dreamsorcerer added a commit that referenced this pull request Sep 10, 2024
patchback bot pushed a commit that referenced this pull request Sep 10, 2024
(cherry picked from commit 1d11241)
(cherry picked from commit b90dd1e)
Dreamsorcerer added a commit that referenced this pull request Sep 10, 2024
… (#9111)

**This is a backport of PR #9110 as merged into 3.11
(b90dd1e).**

(cherry picked from commit 1d11241)

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.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot 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.

Rename compress parameter ServerDisconnectedError with get compress=True
1 participant