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

Raise '400: Content-Length can't be present with Transfer-Encoding' if both Content-Length and Transfer-Encoding are sent by peer #6182

Merged
merged 2 commits into from
Oct 31, 2021

Conversation

asvetlov
Copy link
Member

@asvetlov asvetlov commented Oct 31, 2021

No description provided.

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

codecov bot commented Oct 31, 2021

Codecov Report

Merging #6182 (e7d0e49) into master (bb4ee18) will decrease coverage by 0.00%.
The diff coverage is 90.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6182      +/-   ##
==========================================
- Coverage   93.31%   93.31%   -0.01%     
==========================================
  Files         102      102              
  Lines       30329    30337       +8     
  Branches     2724     2727       +3     
==========================================
+ Hits        28303    28310       +7     
  Misses       1849     1849              
- Partials      177      178       +1     
Flag Coverage Δ
unit 93.24% <90.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
aiohttp/http_parser.py 92.45% <83.33%> (-0.15%) ⬇️
tests/test_http_parser.py 99.05% <100.00%> (+<0.01%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bb4ee18...e7d0e49. Read the comment docs.

@asvetlov asvetlov merged commit f763228 into master Oct 31, 2021
@asvetlov asvetlov deleted the te-over-ct branch October 31, 2021 17:03
@patchback
Copy link
Contributor

patchback bot commented Oct 31, 2021

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

❌ Failed to cleanly apply f763228 on top of patchback/backports/3.8/f763228103c917d34aa8f1a67ac75756aa0ea67b/pr-6182

Backporting merged PR #6182 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.8/f763228103c917d34aa8f1a67ac75756aa0ea67b/pr-6182 upstream/3.8
  4. Now, cherry-pick PR Raise '400: Content-Length can't be present with Transfer-Encoding' if both Content-Length and Transfer-Encoding are sent by peer #6182 contents into that branch:
    $ git cherry-pick -x f763228103c917d34aa8f1a67ac75756aa0ea67b
    If it'll yell at you with something like fatal: Commit f763228103c917d34aa8f1a67ac75756aa0ea67b is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x f763228103c917d34aa8f1a67ac75756aa0ea67b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Raise '400: Content-Length can't be present with Transfer-Encoding' if both Content-Length and Transfer-Encoding are sent by peer #6182 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/f763228103c917d34aa8f1a67ac75756aa0ea67b/pr-6182
  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.

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

asvetlov added a commit that referenced this pull request Oct 31, 2021
…f both Content-Length and Transfer-Encoding are sent by peer (#6182)
@asvetlov
Copy link
Member Author

Backported by f016f06

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

1 participant