Fix ClientResponse.close releasing the connection instead of closing #7869

bdraco · 2023-11-22T17:42:36Z

What do these changes do?

Fix ClientResponse.close releasing the connection instead of closing

Are there changes in behavior for the user?

Related issue number

fixes #7864

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."

fixes aio-libs#7864

codecov · 2023-11-22T17:54:54Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (3a21134) 97.40% compared to head (595c750) 97.40%.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #7869   +/-   ##
=======================================
  Coverage   97.40%   97.40%           
=======================================
  Files         107      107           
  Lines       32190    32213   +23     
  Branches     3740     3744    +4     
=======================================
+ Hits        31354    31377   +23     
  Misses        632      632           
  Partials      204      204

Flag	Coverage Δ
CI-GHA	`97.32% <100.00%> (+<0.01%)`	⬆️
OS-Linux	`96.99% <100.00%> (+<0.01%)`	⬆️
OS-Windows	`95.48% <100.00%> (+<0.01%)`	⬆️
OS-macOS	`96.66% <100.00%> (+<0.01%)`	⬆️
Py-3.10.11	`95.40% <100.00%> (+<0.01%)`	⬆️
Py-3.10.13	`96.84% <100.00%> (+<0.01%)`	⬆️
Py-3.11.6	`96.50% <100.00%> (+<0.01%)`	⬆️
Py-3.12.0	`96.57% <100.00%> (+<0.01%)`	⬆️
Py-3.8.10	`95.37% <100.00%> (+<0.01%)`	⬆️
Py-3.8.18	`96.77% <100.00%> (+<0.01%)`	⬆️
Py-3.9.13	`95.37% <100.00%> (+<0.01%)`	⬆️
Py-3.9.18	`96.80% <100.00%> (-0.01%)`	⬇️
Py-pypy7.3.13	`96.27% <100.00%> (+<0.01%)`	⬆️
VM-macos	`96.66% <100.00%> (+<0.01%)`	⬆️
VM-ubuntu	`96.99% <100.00%> (+<0.01%)`	⬆️
VM-windows	`95.48% <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

If we can get a test that somehow reproduces the reported issue by triggering an exception and then doing another request or something, that'd be great.

bdraco · 2023-11-22T18:32:40Z

I don't really like having to check _conns but I don't see a better way to know if the connection is really closed

This reverts commit 3cd350c.

bdraco · 2023-11-22T18:38:41Z

test is good now, its fails on master and passes in this pr

bdraco · 2023-11-22T18:47:24Z

Seems to work fine on production. But considering I didn't catch the original problem, I'm not sure how good of a test that is.

bdraco · 2023-11-22T19:00:32Z

I think that hopefully wraps up both the blocking issue. I'm still in flight back from europe for another 5 hours but I'm available on discord as bdraco or via email nick@koston.org if something else comes up as github notifications don't work very well with airplane wifi

patchback · 2023-11-22T19:14:38Z

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

❌ Failed to cleanly apply 25ef450 on top of patchback/backports/3.9/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869

Backporting merged PR #7869 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869 upstream/3.9

Now, cherry-pick PR Fix ClientResponse.close releasing the connection instead of closing #7869 contents into that branch:
```
$ git cherry-pick -x 25ef450238864d06ba8a44227080e4a7b354ba76
```
If it'll yell at you with something like fatal: Commit 25ef450238864d06ba8a44227080e4a7b354ba76 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 25ef450238864d06ba8a44227080e4a7b354ba76
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix ClientResponse.close releasing the connection instead of closing #7869 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.9/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869

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.

patchback · 2023-11-22T19:14:44Z

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

❌ Failed to cleanly apply 25ef450 on top of patchback/backports/3.10/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869

Backporting merged PR #7869 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869 upstream/3.10

Now, cherry-pick PR Fix ClientResponse.close releasing the connection instead of closing #7869 contents into that branch:
```
$ git cherry-pick -x 25ef450238864d06ba8a44227080e4a7b354ba76
```
If it'll yell at you with something like fatal: Commit 25ef450238864d06ba8a44227080e4a7b354ba76 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 25ef450238864d06ba8a44227080e4a7b354ba76
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix ClientResponse.close releasing the connection instead of closing #7869 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.10/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869

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.

sylvainmouquet · 2023-11-22T19:35:16Z

when the patch will be available in a release ?

…io-libs#7869) (cherry picked from commit 25ef450)

bdraco · 2023-11-22T19:41:15Z

Working on the patchbacks now (just trying to get the urls to load) — airplane wifi is making it harder as latency is about 1800ms at the moment https://github.com/bdraco/aiohttp/pull/new/patchback/backports/3.9/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869 https://github.com/bdraco/aiohttp/pull/new/patchback/backports/3.10/25ef450238864d06ba8a44227080e4a7b354ba76/pr-7869

…

On Nov 22, 2023, at 8:35 PM, Sylvain MOUQUET ***@***.***> wrote: when the patch will be available in a release ? — Reply to this email directly, view it on GitHub <#7869 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAFB7CBCYVBRK7WGFH77ZGDYFZHX5AVCNFSM6AAAAAA7WTSCOOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQMRTGQYDIMRZGA>. You are receiving this because you authored the thread.

…7869) (#7874) (cherry picked from commit 25ef450)

…7869) (#7873) (cherry picked from commit 25ef450)

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.0 to 3.9.1. <details> <summary>Release notes</summary> Sourced from <a href="https://github.com/aio-libs/aiohttp/releases">aiohttp's releases</a>. <blockquote> <h2>3.9.1</h2> <h2>Bugfixes</h2> <ul> <li> Fixed importing aiohttp under PyPy on Windows. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7848">#7848</a>) </li> <li> Fixed async concurrency safety in websocket compressor. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7865">#7865</a>) </li> <li> Fixed <code>ClientResponse.close()</code> releasing the connection instead of closing. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7869">#7869</a>) </li> <li> Fixed a regression where connection may get closed during upgrade. -- by :user:<code>Dreamsorcerer</code> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7879">#7879</a>) </li> <li> Fixed messages being reported as upgraded without an Upgrade header in Python parser. -- by :user:<code>Dreamsorcerer</code> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7895">#7895</a>) </li> </ul> <hr /> </blockquote> </details> <details> <summary>Changelog</summary> Sourced from <a href="https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst">aiohttp's changelog</a>. <blockquote> <h1>3.9.1 (2023-11-26)</h1> <h2>Bugfixes</h2> <ul> <li> Fixed importing aiohttp under PyPy on Windows. <code>[#7848](aio-libs/aiohttp#7848) <https://github.com/aio-libs/aiohttp/issues/7848></code>_ </li> <li> Fixed async concurrency safety in websocket compressor. <code>[#7865](aio-libs/aiohttp#7865) <https://github.com/aio-libs/aiohttp/issues/7865></code>_ </li> <li> Fixed <code>ClientResponse.close()</code> releasing the connection instead of closing. <code>[#7869](aio-libs/aiohttp#7869) <https://github.com/aio-libs/aiohttp/issues/7869></code>_ </li> <li> Fixed a regression where connection may get closed during upgrade. -- by :user:<code>Dreamsorcerer</code> <code>[#7879](aio-libs/aiohttp#7879) <https://github.com/aio-libs/aiohttp/issues/7879></code>_ </li> <li> Fixed messages being reported as upgraded without an Upgrade header in Python parser. -- by :user:<code>Dreamsorcerer</code> <code>[#7895](aio-libs/aiohttp#7895) <https://github.com/aio-libs/aiohttp/issues/7895></code>_ </li> </ul> <hr /> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aio-libs/aiohttp/commit/6333c026422c6b0fe57ff63cde4104e2d00f47f4"><code>6333c02</code></a> Release v3.9.1 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7911">#7911</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/9dbd273093d6af6f5e1481816b05a7192860b440"><code>9dbd273</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7673">#7673</a>/aa7d1a8f backport][3.9] Document release process (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7909">#7909</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/dd175b6b89564dc74fba0692a8a5f9a9b38e528a"><code>dd175b6</code></a> Fix regression with connection upgrade (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7879">#7879</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7908">#7908</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/946523d6380bd79e13146557432f46f6f9bbd53f"><code>946523d</code></a> Fix flaky websocket test (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7902">#7902</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7904">#7904</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/ddc2a26c9e0c43fd1229e4424f2a30d1b10ced13"><code>ddc2a26</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7896">#7896</a>/9a7cfe77 backport][3.9] Fix some flaky tests (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7900">#7900</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/2ae4d6ffdd015f622bfb75dee98ad629240cccc4"><code>2ae4d6f</code></a> Message is not upgraded if Upgrade header is missing (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7895">#7895</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7898">#7898</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/bb111012706d3ef9edc525be3d8d4df410ad847f"><code>bb11101</code></a> Restore async concurrency safety to websocket compressor (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7865">#7865</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7889">#7889</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/6dd0122417f00ed4b2b353226a1b164b6463a245"><code>6dd0122</code></a> Update dependabot.yml (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7888">#7888</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/41a9f1f5b9b2630b1f4b971811c7ef8f016262fb"><code>41a9f1f</code></a> Bump mypy from 1.7.0 to 1.7.1 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7882">#7882</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/a04970150c6ce9fda22c9f63d947845f79148b4c"><code>a049701</code></a> Fix usage of proxy.py in test_proxy_functional (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7773">#7773</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7876">#7876</a>)</li> <li>Additional commits viewable in <a href="https://github.com/aio-libs/aiohttp/compare/v3.9.0...v3.9.1">compare view</a></li> </ul> </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=aiohttp&package-manager=pip&previous-version=3.9.0&new-version=3.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>

…io-libs#7869)

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.0 to 3.9.1. <details> <summary>Release notes</summary> Sourced from <a href="https://github.com/aio-libs/aiohttp/releases">aiohttp's releases</a>. <blockquote> <h2>3.9.1</h2> <h2>Bugfixes</h2> <ul> <li> Fixed importing aiohttp under PyPy on Windows. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7848">#7848</a>) </li> <li> Fixed async concurrency safety in websocket compressor. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7865">#7865</a>) </li> <li> Fixed <code>ClientResponse.close()</code> releasing the connection instead of closing. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7869">#7869</a>) </li> <li> Fixed a regression where connection may get closed during upgrade. -- by :user:<code>Dreamsorcerer</code> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7879">#7879</a>) </li> <li> Fixed messages being reported as upgraded without an Upgrade header in Python parser. -- by :user:<code>Dreamsorcerer</code> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7895">#7895</a>) </li> </ul> <hr /> </blockquote> </details> <details> <summary>Changelog</summary> Sourced from <a href="https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst">aiohttp's changelog</a>. <blockquote> <h1>3.9.1 (2023-11-26)</h1> <h2>Bugfixes</h2> <ul> <li> Fixed importing aiohttp under PyPy on Windows. <code>[#7848](aio-libs/aiohttp#7848) <https://github.com/aio-libs/aiohttp/issues/7848></code>_ </li> <li> Fixed async concurrency safety in websocket compressor. <code>[#7865](aio-libs/aiohttp#7865) <https://github.com/aio-libs/aiohttp/issues/7865></code>_ </li> <li> Fixed <code>ClientResponse.close()</code> releasing the connection instead of closing. <code>[#7869](aio-libs/aiohttp#7869) <https://github.com/aio-libs/aiohttp/issues/7869></code>_ </li> <li> Fixed a regression where connection may get closed during upgrade. -- by :user:<code>Dreamsorcerer</code> <code>[#7879](aio-libs/aiohttp#7879) <https://github.com/aio-libs/aiohttp/issues/7879></code>_ </li> <li> Fixed messages being reported as upgraded without an Upgrade header in Python parser. -- by :user:<code>Dreamsorcerer</code> <code>[#7895](aio-libs/aiohttp#7895) <https://github.com/aio-libs/aiohttp/issues/7895></code>_ </li> </ul> <hr /> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aio-libs/aiohttp/commit/6333c026422c6b0fe57ff63cde4104e2d00f47f4"><code>6333c02</code></a> Release v3.9.1 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7911">#7911</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/9dbd273093d6af6f5e1481816b05a7192860b440"><code>9dbd273</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7673">#7673</a>/aa7d1a8f backport][3.9] Document release process (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7909">#7909</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/dd175b6b89564dc74fba0692a8a5f9a9b38e528a"><code>dd175b6</code></a> Fix regression with connection upgrade (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7879">#7879</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7908">#7908</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/946523d6380bd79e13146557432f46f6f9bbd53f"><code>946523d</code></a> Fix flaky websocket test (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7902">#7902</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7904">#7904</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/ddc2a26c9e0c43fd1229e4424f2a30d1b10ced13"><code>ddc2a26</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7896">#7896</a>/9a7cfe77 backport][3.9] Fix some flaky tests (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7900">#7900</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/2ae4d6ffdd015f622bfb75dee98ad629240cccc4"><code>2ae4d6f</code></a> Message is not upgraded if Upgrade header is missing (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7895">#7895</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7898">#7898</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/bb111012706d3ef9edc525be3d8d4df410ad847f"><code>bb11101</code></a> Restore async concurrency safety to websocket compressor (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7865">#7865</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7889">#7889</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/6dd0122417f00ed4b2b353226a1b164b6463a245"><code>6dd0122</code></a> Update dependabot.yml (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7888">#7888</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/41a9f1f5b9b2630b1f4b971811c7ef8f016262fb"><code>41a9f1f</code></a> Bump mypy from 1.7.0 to 1.7.1 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7882">#7882</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/a04970150c6ce9fda22c9f63d947845f79148b4c"><code>a049701</code></a> Fix usage of proxy.py in test_proxy_functional (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7773">#7773</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7876">#7876</a>)</li> <li>Additional commits viewable in <a href="https://github.com/aio-libs/aiohttp/compare/v3.9.0...v3.9.1">compare view</a></li> </ul> </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=aiohttp&package-manager=pip&previous-version=3.9.0&new-version=3.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.6 to 3.9.1. <details> <summary>Release notes</summary> Sourced from <a href="https://github.com/aio-libs/aiohttp/releases">aiohttp's releases</a>. <blockquote> <h2>3.9.1</h2> <h2>Bugfixes</h2> <ul> <li> Fixed importing aiohttp under PyPy on Windows. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7848">#7848</a>) </li> <li> Fixed async concurrency safety in websocket compressor. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7865">#7865</a>) </li> <li> Fixed <code>ClientResponse.close()</code> releasing the connection instead of closing. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7869">#7869</a>) </li> <li> Fixed a regression where connection may get closed during upgrade. -- by :user:<code>Dreamsorcerer</code> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7879">#7879</a>) </li> <li> Fixed messages being reported as upgraded without an Upgrade header in Python parser. -- by :user:<code>Dreamsorcerer</code> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7895">#7895</a>) </li> </ul> <hr /> <h2>3.9.0</h2> <h2>Features</h2> <ul> <li> Introduced <code>AppKey</code> for static typing support of <code>Application</code> storage. See <a href="https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config">https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config</a> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/5864">#5864</a>) </li> <li> Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the <code>shutdown_timeout</code> parameter. -- by :user:<code>Dreamsorcerer</code>. See <a href="https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown">https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown</a> (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7188">#7188</a>) </li> <li> Added <code>handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation></code>_ parameter to cancel web handler on client disconnection. -- by :user:<code>mosquito</code> This (optionally) reintroduces a feature removed in a previous release. Recommended for those looking for an extra level of protection against denial-of-service attacks. (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7056">#7056</a>) </li> <li> Added support for setting response header parameters <code>max_line_size</code> and <code>max_field_size</code>. </li> </ul>  </blockquote> ... (truncated) </details> <details> <summary>Changelog</summary> Sourced from <a href="https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst">aiohttp's changelog</a>. <blockquote> <h1>3.9.1 (2023-11-26)</h1> <h2>Bugfixes</h2> <ul> <li> Fixed importing aiohttp under PyPy on Windows. <code>[#7848](aio-libs/aiohttp#7848) <https://github.com/aio-libs/aiohttp/issues/7848></code>_ </li> <li> Fixed async concurrency safety in websocket compressor. <code>[#7865](aio-libs/aiohttp#7865) <https://github.com/aio-libs/aiohttp/issues/7865></code>_ </li> <li> Fixed <code>ClientResponse.close()</code> releasing the connection instead of closing. <code>[#7869](aio-libs/aiohttp#7869) <https://github.com/aio-libs/aiohttp/issues/7869></code>_ </li> <li> Fixed a regression where connection may get closed during upgrade. -- by :user:<code>Dreamsorcerer</code> <code>[#7879](aio-libs/aiohttp#7879) <https://github.com/aio-libs/aiohttp/issues/7879></code>_ </li> <li> Fixed messages being reported as upgraded without an Upgrade header in Python parser. -- by :user:<code>Dreamsorcerer</code> <code>[#7895](aio-libs/aiohttp#7895) <https://github.com/aio-libs/aiohttp/issues/7895></code>_ </li> </ul> <hr /> <h1>3.9.0 (2023-11-18)</h1> <h2>Features</h2> <ul> <li> Introduced <code>AppKey</code> for static typing support of <code>Application</code> storage. See <a href="https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config">https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config</a> <code>[#5864](aio-libs/aiohttp#5864) <https://github.com/aio-libs/aiohttp/issues/5864></code>_ </li> <li> Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the <code>shutdown_timeout</code> parameter. -- by :user:<code>Dreamsorcerer</code>. See <a href="https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown">https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown</a> <code>[#7188](aio-libs/aiohttp#7188) <https://github.com/aio-libs/aiohttp/issues/7188></code>_ </li> <li> Added <code>handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation></code>_ parameter to cancel web handler on client disconnection. -- by :user:<code>mosquito</code> This (optionally) reintroduces a feature removed in a previous release. </li> </ul>  </blockquote> ... (truncated) </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/aio-libs/aiohttp/commit/6333c026422c6b0fe57ff63cde4104e2d00f47f4"><code>6333c02</code></a> Release v3.9.1 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7911">#7911</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/9dbd273093d6af6f5e1481816b05a7192860b440"><code>9dbd273</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7673">#7673</a>/aa7d1a8f backport][3.9] Document release process (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7909">#7909</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/dd175b6b89564dc74fba0692a8a5f9a9b38e528a"><code>dd175b6</code></a> Fix regression with connection upgrade (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7879">#7879</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7908">#7908</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/946523d6380bd79e13146557432f46f6f9bbd53f"><code>946523d</code></a> Fix flaky websocket test (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7902">#7902</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7904">#7904</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/ddc2a26c9e0c43fd1229e4424f2a30d1b10ced13"><code>ddc2a26</code></a> [PR <a href="https://redirect.github.com/aio-libs/aiohttp/issues/7896">#7896</a>/9a7cfe77 backport][3.9] Fix some flaky tests (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7900">#7900</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/2ae4d6ffdd015f622bfb75dee98ad629240cccc4"><code>2ae4d6f</code></a> Message is not upgraded if Upgrade header is missing (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7895">#7895</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7898">#7898</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/bb111012706d3ef9edc525be3d8d4df410ad847f"><code>bb11101</code></a> Restore async concurrency safety to websocket compressor (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7865">#7865</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7889">#7889</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/6dd0122417f00ed4b2b353226a1b164b6463a245"><code>6dd0122</code></a> Update dependabot.yml (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7888">#7888</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/41a9f1f5b9b2630b1f4b971811c7ef8f016262fb"><code>41a9f1f</code></a> Bump mypy from 1.7.0 to 1.7.1 (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7882">#7882</a>)</li> <li><a href="https://github.com/aio-libs/aiohttp/commit/a04970150c6ce9fda22c9f63d947845f79148b4c"><code>a049701</code></a> Fix usage of proxy.py in test_proxy_functional (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7773">#7773</a>) (<a href="https://redirect.github.com/aio-libs/aiohttp/issues/7876">#7876</a>)</li> <li>Additional commits viewable in <a href="https://github.com/aio-libs/aiohttp/compare/v3.8.6...v3.9.1">compare view</a></li> </ul> </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=aiohttp&package-manager=pip&previous-version=3.8.6&new-version=3.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>

Fix ClientResponse.close releasing the connection instead of closing

89fd434

fixes aio-libs#7864

Dreamsorcerer approved these changes Nov 22, 2023

View reviewed changes

bdraco added 2 commits November 22, 2023 18:57

coverage

e1a82c8

check the connector

1ae7255

Dreamsorcerer mentioned this pull request Nov 22, 2023

Fix closing connection after read (#7867) #7868

Closed

5 tasks

use total

ebee38e

news

3cd350c

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 22, 2023

bdraco added 2 commits November 22, 2023 19:36

Revert "news"

3e374bd

This reverts commit 3cd350c.

keep fix

f6c5a6d

Merge branch 'master' into close_closes

595c750

bdraco marked this pull request as ready for review November 22, 2023 18:49

bdraco requested a review from asvetlov as a code owner November 22, 2023 18:49

Dreamsorcerer added backport-3.9 Trigger automatic backporting to the 3.9 release branch by Patchback robot backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot labels Nov 22, 2023

Dreamsorcerer merged commit 25ef450 into aio-libs:master Nov 22, 2023
30 of 34 checks passed

bdraco added a commit to bdraco/aiohttp that referenced this pull request Nov 22, 2023

Fix ClientResponse.close releasing the connection instead of closing (a…

411e67d

…io-libs#7869) (cherry picked from commit 25ef450)

bdraco added a commit to bdraco/aiohttp that referenced this pull request Nov 22, 2023

Fix ClientResponse.close releasing the connection instead of closing (a…

5a2db9b

…io-libs#7869) (cherry picked from commit 25ef450)

matan1008 mentioned this pull request Nov 23, 2023

Response connection is None on 3.9.0 #7867

Closed

1 task

Dreamsorcerer pushed a commit that referenced this pull request Nov 23, 2023

Fix ClientResponse.close releasing the connection instead of closing (#…

45147c4

…7869) (#7874) (cherry picked from commit 25ef450)

Dreamsorcerer pushed a commit that referenced this pull request Nov 23, 2023

Fix ClientResponse.close releasing the connection instead of closing (#…

5fa260a

…7869) (#7873) (cherry picked from commit 25ef450)

bdraco deleted the close_closes branch November 27, 2023 04:41

b-deam mentioned this pull request Nov 28, 2023

Bump aiohttp from 3.8.6 to 3.9.0 elastic/rally#1807

Closed

xiangxli pushed a commit to xiangxli/aiohttp that referenced this pull request Dec 4, 2023

Fix ClientResponse.close releasing the connection instead of closing (a…

6799a0d

…io-libs#7869)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix ClientResponse.close releasing the connection instead of closing #7869

Fix ClientResponse.close releasing the connection instead of closing #7869

bdraco commented Nov 22, 2023

codecov bot commented Nov 22, 2023 •

edited

Dreamsorcerer left a comment

bdraco commented Nov 22, 2023

bdraco commented Nov 22, 2023

bdraco commented Nov 22, 2023

bdraco commented Nov 22, 2023

patchback bot commented Nov 22, 2023 •

edited

patchback bot commented Nov 22, 2023 •

edited

sylvainmouquet commented Nov 22, 2023

bdraco commented Nov 22, 2023 via email

Fix ClientResponse.close releasing the connection instead of closing #7869

Fix ClientResponse.close releasing the connection instead of closing #7869

Conversation

bdraco commented Nov 22, 2023

What do these changes do?

Are there changes in behavior for the user?

Related issue number

Checklist

codecov bot commented Nov 22, 2023 • edited

Codecov Report

Dreamsorcerer left a comment

Choose a reason for hiding this comment

bdraco commented Nov 22, 2023

bdraco commented Nov 22, 2023

bdraco commented Nov 22, 2023

bdraco commented Nov 22, 2023

patchback bot commented Nov 22, 2023 • edited

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

Backporting merged PR #7869 into master

patchback bot commented Nov 22, 2023 • edited

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

Backporting merged PR #7869 into master

sylvainmouquet commented Nov 22, 2023

bdraco commented Nov 22, 2023 via email

codecov bot commented Nov 22, 2023 •

edited

patchback bot commented Nov 22, 2023 •

edited

patchback bot commented Nov 22, 2023 •

edited