Fix regression with connection upgrade #7879

Dreamsorcerer · 2023-11-23T17:25:33Z

Fixes #7867.

tests/test_client_functional.py

for more information, see https://pre-commit.ci

codecov · 2023-11-25T18:57:35Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (4d9fc63) 97.40% compared to head (2ddee9f) 97.41%.
Report is 8 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #7879   +/-   ##
=======================================
  Coverage   97.40%   97.41%           
=======================================
  Files         107      107           
  Lines       32207    32263   +56     
  Branches     3743     3750    +7     
=======================================
+ Hits        31371    31428   +57     
  Misses        632      632           
+ Partials      204      203    -1

Flag	Coverage Δ
CI-GHA	`97.32% <100.00%> (+<0.01%)`	⬆️
OS-Linux	`96.99% <100.00%> (+<0.01%)`	⬆️
OS-Windows	`95.49% <100.00%> (+0.01%)`	⬆️
OS-macOS	`96.62% <100.00%> (-0.19%)`	⬇️
Py-3.10.11	`95.41% <100.00%> (+<0.01%)`	⬆️
Py-3.10.13	`96.79% <100.00%> (+<0.01%)`	⬆️
Py-3.11.6	`96.50% <100.00%> (-0.03%)`	⬇️
Py-3.12.0	`96.57% <100.00%> (-0.03%)`	⬇️
Py-3.8.10	`95.38% <100.00%> (+0.01%)`	⬆️
Py-3.8.18	`96.73% <100.00%> (+<0.01%)`	⬆️
Py-3.9.13	`95.38% <100.00%> (+0.01%)`	⬆️
Py-3.9.18	`96.76% <100.00%> (+<0.01%)`	⬆️
Py-pypy7.3.13	`96.23% <100.00%> (+<0.01%)`	⬆️
VM-macos	`96.62% <100.00%> (-0.19%)`	⬇️
VM-ubuntu	`96.99% <100.00%> (+<0.01%)`	⬆️
VM-windows	`95.49% <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.

aiohttp/client_reqrep.py

bdraco · 2023-11-25T23:24:50Z

I'll throw this on production shortly

bdraco

LGTM

I put this on two production systems and everything is still working as expected.

bdraco · 2023-11-26T00:06:32Z

I beat it up a bit with a lot of websocket connections and didn't hit any issues

patchback · 2023-11-26T14:33:55Z

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

❌ Failed to cleanly apply 48b1558 on top of patchback/backports/3.9/48b15583305e692ce997ec6f5a6a2f88f23ace71/pr-7879

Backporting merged PR #7879 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/48b15583305e692ce997ec6f5a6a2f88f23ace71/pr-7879 upstream/3.9

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

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.9/48b15583305e692ce997ec6f5a6a2f88f23ace71/pr-7879

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-26T14:34:00Z

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

❌ Failed to cleanly apply 48b1558 on top of patchback/backports/3.10/48b15583305e692ce997ec6f5a6a2f88f23ace71/pr-7879

Backporting merged PR #7879 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/48b15583305e692ce997ec6f5a6a2f88f23ace71/pr-7879 upstream/3.10

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

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.10/48b15583305e692ce997ec6f5a6a2f88f23ace71/pr-7879

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.

Fixes #7867. (cherry picked from commit 48b1558)

Dreamsorcerer · 2023-11-26T14:43:20Z

I think that's the last regression I've seen. So, I'll try and push a 3.9.1 release today.

Dreamsorcerer · 2023-11-26T14:45:37Z

By the way, if you have any ideas on an easy way to backport all the type annotations from the tests in master, that'd make the automatic backport a lot more reliable. I think doing it manually would be a lot of work, and I've not thought of an easy way to do it.

Currently, editing any test file basically fails the backport as it will conflict with the type annotation differences.

Fixes #7867. (cherry picked from commit 48b1558)

bdraco · 2023-11-26T15:41:30Z

I really can't think of a good way to do it except manually. If I think of something, I'll be sure to bring it up

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>

Fixes aio-libs#7867.

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 regression with wait_until_eof=False

623ca6f

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 23, 2023

Dreamsorcerer requested a review from asvetlov as a code owner November 23, 2023 17:25

Create 7879.bugfix

99f2166

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

Dreamsorcerer mentioned this pull request Nov 23, 2023

Fix closing connection after read (#7867) #7868

Closed

5 tasks

Dreamsorcerer added 5 commits November 25, 2023 17:24

Fix properly

23c1c91

Merge branch 'fix-no-eof' of github.com:aio-libs/aiohttp into fix-no-eof

18324ef

Update 7879.bugfix

3c12c24

Revert previous fix

3abf480

Merge branch 'fix-no-eof' of github.com:aio-libs/aiohttp into fix-no-eof

e503871

Dreamsorcerer changed the title ~~Fix regression with wait_until_eof=False~~ Fix regression with connection upgrade Nov 25, 2023

Dreamsorcerer commented Nov 25, 2023

View reviewed changes

tests/test_client_functional.py Outdated Show resolved Hide resolved

Update tests/test_client_functional.py

d64b884

Dreamsorcerer commented Nov 25, 2023

View reviewed changes

tests/test_client_functional.py Outdated Show resolved Hide resolved

Update tests/test_client_functional.py

af52f61

Dreamsorcerer commented Nov 25, 2023

View reviewed changes

tests/test_client_functional.py Outdated Show resolved Hide resolved

Dreamsorcerer and others added 2 commits November 25, 2023 18:48

Update tests/test_client_functional.py

3e3a910

[pre-commit.ci] auto fixes from pre-commit.com hooks

cef6586

for more information, see https://pre-commit.ci

Dreamsorcerer requested a review from bdraco November 25, 2023 18:59

Dreamsorcerer added 2 commits November 25, 2023 22:40

Ensure not closed

34e07f8

Tweak

a3ff38e

bdraco reviewed Nov 25, 2023

View reviewed changes

aiohttp/client_reqrep.py Show resolved Hide resolved

Dreamsorcerer added 3 commits November 25, 2023 22:53

Tweak

ae2bae0

Ignore

028b45a

Wrong line

b18f4a2

bdraco approved these changes Nov 25, 2023

View reviewed changes

Dreamsorcerer added 3 commits November 26, 2023 13:34

Fix type error

91beedf

Update connector.py

828af69

Update client_reqrep.py

2ddee9f

bdraco approved these changes Nov 26, 2023

View reviewed changes

Dreamsorcerer merged commit 48b1558 into master Nov 26, 2023
30 of 34 checks passed

Dreamsorcerer deleted the fix-no-eof branch November 26, 2023 14:33

Dreamsorcerer added a commit that referenced this pull request Nov 26, 2023

Fix regression with connection upgrade (#7879)

6db183c

Fixes #7867. (cherry picked from commit 48b1558)

Dreamsorcerer added a commit that referenced this pull request Nov 26, 2023

Fix regression with connection upgrade (#7879)

5875b17

Fixes #7867. (cherry picked from commit 48b1558)

Dreamsorcerer added a commit that referenced this pull request Nov 26, 2023

Fix regression with connection upgrade (#7879) (#7907)

566f346

Fixes #7867. (cherry picked from commit 48b1558)

Dreamsorcerer added a commit that referenced this pull request Nov 26, 2023

Fix regression with connection upgrade (#7879) (#7908)

dd175b6

Fixes #7867. (cherry picked from commit 48b1558)

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

Fix regression with connection upgrade (aio-libs#7879)

24434da

Fixes aio-libs#7867.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix regression with connection upgrade #7879

Fix regression with connection upgrade #7879

Dreamsorcerer commented Nov 23, 2023

codecov bot commented Nov 25, 2023 •

edited

bdraco commented Nov 25, 2023

bdraco left a comment

bdraco commented Nov 26, 2023

patchback bot commented Nov 26, 2023 •

edited

patchback bot commented Nov 26, 2023 •

edited

Dreamsorcerer commented Nov 26, 2023

Dreamsorcerer commented Nov 26, 2023

bdraco commented Nov 26, 2023

Fix regression with connection upgrade #7879

Fix regression with connection upgrade #7879

Conversation

Dreamsorcerer commented Nov 23, 2023

codecov bot commented Nov 25, 2023 • edited

Codecov Report

bdraco commented Nov 25, 2023

bdraco left a comment

Choose a reason for hiding this comment

bdraco commented Nov 26, 2023

patchback bot commented Nov 26, 2023 • edited

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

Backporting merged PR #7879 into master

patchback bot commented Nov 26, 2023 • edited

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

Backporting merged PR #7879 into master

Dreamsorcerer commented Nov 26, 2023

Dreamsorcerer commented Nov 26, 2023

bdraco commented Nov 26, 2023

codecov bot commented Nov 25, 2023 •

edited

patchback bot commented Nov 26, 2023 •

edited

patchback bot commented Nov 26, 2023 •

edited