Skip to content

Conversation

@ZhaoMJ
Copy link
Contributor

@ZhaoMJ ZhaoMJ commented Oct 9, 2025

What do these changes do?

The changes fix the decompression of chunked zstd streams.

Are there changes in behavior for the user?

Previously, on chunked zstd streams, aiohttp would crash with zstandard.backend_c.ZstdError: could not determine content size in frame header or zstd.ZstdError: decompression error: did not decompress full frame.
Now it doesn't.

Related issue number

#11604 tries to fix the same issue, but there's no corresponding GitHub issue opened yet.

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_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.
    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
      -- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 9, 2025
@codecov
Copy link

codecov bot commented Oct 9, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.74%. Comparing base (3cf4eba) to head (7238805).
⚠️ Report is 3228 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11623      +/-   ##
==========================================
+ Coverage   98.19%   98.74%   +0.55%     
==========================================
  Files         128      127       -1     
  Lines       43757    43448     -309     
  Branches     2384     2326      -58     
==========================================
- Hits        42965    42903      -62     
+ Misses        610      389     -221     
+ Partials      182      156      -26     
Flag Coverage Δ
CI-GHA 98.63% <81.81%> (+0.54%) ⬆️
OS-Linux 98.36% <81.81%> (+0.52%) ⬆️
OS-Windows 96.69% <54.54%> (+1.15%) ⬆️
OS-macOS 97.58% <54.54%> (+0.51%) ⬆️
Py-3.10.11 97.14% <36.36%> (+0.54%) ⬆️
Py-3.10.18 97.64% <36.36%> (+0.53%) ⬆️
Py-3.11.13 97.84% <36.36%> (+0.48%) ⬆️
Py-3.11.9 97.35% <36.36%> (+0.50%) ⬆️
Py-3.12.10 97.45% <36.36%> (+0.51%) ⬆️
Py-3.12.11 97.94% <36.36%> (+0.50%) ⬆️
Py-3.13.7 98.20% <36.36%> (+0.53%) ⬆️
Py-3.14.0 98.16% <36.36%> (+0.51%) ⬆️
Py-3.14.0t 97.22% <36.36%> (+0.50%) ⬆️
Py-pypy3.10.16-7.3.19 83.05% <54.54%> (+0.09%) ⬆️
VM-macos 97.58% <54.54%> (+0.51%) ⬆️
VM-ubuntu 98.36% <81.81%> (+0.52%) ⬆️
VM-windows 96.69% <54.54%> (+1.15%) ⬆️

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.

@codspeed-hq
Copy link

codspeed-hq bot commented Oct 9, 2025

CodSpeed Performance Report

Merging #11623 will not alter performance

Comparing ZhaoMJ:master (7238805) with master (4929094)1

Summary

✅ 59 untouched

Footnotes

  1. No successful run was found on master (7a404ed) during the generation of this report, so 4929094 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

@Dreamsorcerer Dreamsorcerer added backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot labels Oct 9, 2025
@Dreamsorcerer Dreamsorcerer merged commit df8ad83 into aio-libs:master Oct 9, 2025
42 of 43 checks passed
@patchback
Copy link
Contributor

patchback bot commented Oct 9, 2025

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

❌ Failed to cleanly apply df8ad83 on top of patchback/backports/3.13/df8ad83efdd33408db2803cbd4a50be45422b74f/pr-11623

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

@patchback
Copy link
Contributor

patchback bot commented Oct 9, 2025

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

❌ Failed to cleanly apply df8ad83 on top of patchback/backports/3.14/df8ad83efdd33408db2803cbd4a50be45422b74f/pr-11623

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

Think you could handle those backports?

ZhaoMJ added a commit to ZhaoMJ/aiohttp that referenced this pull request Oct 9, 2025
ZhaoMJ added a commit to ZhaoMJ/aiohttp that referenced this pull request Oct 9, 2025
@ZhaoMJ
Copy link
Contributor Author

ZhaoMJ commented Oct 9, 2025

@Dreamsorcerer backports:
#11625
#11624

Dreamsorcerer pushed a commit that referenced this pull request Oct 9, 2025
Dreamsorcerer pushed a commit that referenced this pull request Oct 9, 2025
Harmon758 added a commit to Harmon758/Harmonbot that referenced this pull request Oct 12, 2025
To avoid issue resolved by aio-libs/aiohttp#11623 while waiting for release with fix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-3.13 Trigger automatic backporting to the 3.13 release branch by Patchback robot backport-3.14 Trigger automatic backporting to the 3.14 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.

2 participants