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.

Sign up for GitHub

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

Jump to bottom

Fix reading of body when ignoring an upgrade request #8597

Merged
merged 7 commits into from
Aug 7, 2024
Merged

Fix reading of body when ignoring an upgrade request #8597

merged 7 commits into from
Aug 7, 2024
+33 −15

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Aug 3, 2024 •
edited
Loading

Fixes #8414.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 3, 2024
@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 Aug 3, 2024
@codecov Codecov
Copy link

codecov bot commented Aug 3, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.69%. Comparing base (3b4cf01) to head (151a974).
Report is 880 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #8597      +/-   ##
==========================================
- Coverage   97.70%   97.69%   -0.02%     
==========================================
  Files         107      107              
  Lines       33443    33447       +4     
  Branches     3927     3926       -1     
==========================================
- Hits        32677    32675       -2     
- Misses        555      558       +3     
- Partials      211      214       +3
Flag Coverage Δ
CI-GHA 97.60% <100.00%> (-0.02%) ⬇️
OS-Linux 97.26% <100.00%> (-0.02%) ⬇️
OS-Windows 95.64% <100.00%> (-0.01%) ⬇️
OS-macOS 96.93% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.07% <100.00%> (-0.01%) ⬇️
Py-3.10.14 97.01% <100.00%> (-0.02%) ⬇️
Py-3.11.9 97.23% <100.00%> (-0.02%) ⬇️
Py-3.12.4 97.36% <100.00%> (-0.02%) ⬇️
Py-3.8.10 95.40% <100.00%> (-0.01%) ⬇️
Py-3.8.18 96.90% <100.00%> (-0.02%) ⬇️
Py-3.9.13 97.07% <100.00%> (-0.01%) ⬇️
Py-3.9.19 97.01% <100.00%> (-0.02%) ⬇️
Py-pypy7.3.16 96.59% <100.00%> (+<0.01%) ⬆️
VM-macos 96.93% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.26% <100.00%> (-0.02%) ⬇️
VM-windows 95.64% <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 mentioned this pull request Aug 3, 2024
Closed
1 task
@Dreamsorcerer Dreamsorcerer marked this pull request as ready for review August 3, 2024 17:28
@Dreamsorcerer
Copy link
Member Author

I'm not sure under what condition the self._message_tail code that's missing coverage might still be used in web_protocol.py, or whether that code should just be removed...

@bdraco
Copy link
Member

bdraco commented Aug 7, 2024

I'm not sure under what condition the self._message_tail code that's missing coverage might still be used in web_protocol.py, or whether that code should just be removed...

I'm not sure either. It looks like it came 045dd8c but its unclear if its still needed so probably best to let it be for now until we can prove its not.

@bdraco bdraco merged commit c99a1e2 into master Aug 7, 2024
37 of 38 checks passed
@bdraco bdraco deleted the fix-fail-upgrade branch August 7, 2024 12:59
@patchback Patchback
Copy link
Contributor

patchback bot commented Aug 7, 2024 •
edited
Loading

Backport to 3.10: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.10/c99a1e27375285149ea82cbdcc2f2c40e57596dc/pr-8597

Backported as #8629

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Aug 7, 2024
@Dreamsorcerer @patchback
Fix reading of body when ignoring an upgrade request (#8597)
f2a04a1 
(cherry picked from commit c99a1e2)
@patchback patchback bot mentioned this pull request Aug 7, 2024
Merged
@patchback Patchback
Copy link
Contributor

patchback bot commented Aug 7, 2024 •
edited
Loading

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/c99a1e27375285149ea82cbdcc2f2c40e57596dc/pr-8597

Backported as #8630

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Aug 7, 2024
@Dreamsorcerer @patchback
Fix reading of body when ignoring an upgrade request (#8597)
b5aff6e 
(cherry picked from commit c99a1e2)
@patchback patchback bot mentioned this pull request Aug 7, 2024
Merged
bdraco pushed a commit that referenced this pull request Aug 7, 2024
@patchback @Dreamsorcerer
[PR #8597/c99a1e27 backport][3.11] Fix reading of body when ignoring …
e41592d 
…an upgrade request (#8630)

**This is a backport of PR #8597 as merged into master
(c99a1e2).**

Fixes #8414.

Co-authored-by: Sam Bull <git@sambull.org>
bdraco pushed a commit that referenced this pull request Aug 7, 2024
@patchback
[PR #8597/c99a1e27 backport][3.10] Fix reading of body when ignoring …
4815765 
…an upgrade request (#8629)

Co-authored-by: Sam Bull <git@sambull.org>
Co-authored-by: J. Nick Koston <nick@koston.org>
Fixes #8414.
@Dreamsorcerer Dreamsorcerer mentioned this pull request Aug 15, 2024
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bdraco bdraco bdraco approved these changes

@webknjaz webknjaz Awaiting requested review from webknjaz webknjaz is a code owner

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Broken HTTP request parsing: Upgrade: h2c header leads to discarded body
2 participants
@Dreamsorcerer @bdraco