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

backport to 1.16: connection: Remember transport socket read resumption requests and replay them when re-enabling read. (#13772) #14017

Merged
merged 3 commits into from
Nov 16, 2020
Merged

backport to 1.16: connection: Remember transport socket read resumption requests and replay them when re-enabling read. (#13772) #14017

merged 3 commits into from
Nov 16, 2020

Conversation

cpakulski
Copy link
Contributor

Commit Message: connection: Remember transport socket read resumption requests and replay them when re-enabling read.
Additional Description: Fixes SslSocket read resumption after readDisable when processing the SSL record that contains the last bytes of the HTTP message
Risk Level: low
Testing: new unit and integration tests
Docs Changes: n/a
Release Notes: added
Platform Specific Features: n/a
Fixes #12304

@antoniovicente @cpakulski
backport: connection: Remember transport socket read resumption reque…
207fcb9 
…sts and replay them when re-enabling read. (envoyproxy#13772)

Fixes SslSocket read resumption after readDisable when processing the SSL record that contains the last bytes of the HTTP message

Signed-off-by: Antonio Vicente <avd@google.com>

Signed-off-by: antonio <avd@google.com>
Signed-off-by: Christoph Pakulski <christoph@tetrate.io>
@cpakulski cpakulski marked this pull request as draft November 13, 2020 22:21
antoniovicente
antoniovicente approved these changes Nov 13, 2020
View reviewed changes
Copy link
Contributor

@antoniovicente antoniovicente left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the backport. Only differences from the master branch patch are adjustments to the setEnable and activate calls due to IoHandle and FileEventImpl API refactors.

antoniovicente
antoniovicente reviewed Nov 13, 2020
View reviewed changes
Copy link
Contributor

@antoniovicente antoniovicente left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a problem with CI, possibly related to compiler versions.

@cpakulski
Use file_event_->activate to activate events.
c6790f8 
Signed-off-by: Christoph Pakulski <christoph@tetrate.io>
@cpakulski
upsteam_headers->get in 1.16 returns HeaderEntry*, while master
f464db9 
branch has moved to use GetResult as return.

Signed-off-by: Christoph Pakulski <christoph@tetrate.io>
@cpakulski cpakulski marked this pull request as ready for review November 16, 2020 16:38
@lizan lizan merged commit ff28aac into envoyproxy:release/v1.16 Nov 16, 2020
@cpakulski cpakulski deleted the rel1.16/13772 branch December 14, 2020 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoniovicente antoniovicente antoniovicente approved these changes

@lizan lizan Awaiting requested review from lizan

@PiotrSikora PiotrSikora Awaiting requested review from PiotrSikora

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cpakulski @antoniovicente @lizan