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
Actually send header and code during WriteHeader, if needed #5404
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ldez
approved these changes
Sep 18, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
dtomcej
approved these changes
Sep 18, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
mmatur
approved these changes
Sep 20, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Before this change, the codeCatcher relied on the fact that Write would always be called, and hence was in charge of actually sending the headers that WriteHeader had "cached" when it had been called. However, in the case of e.g. a 304, since the response should not have any body, there is no reason for the caller (i.e. another proxy or middleware in the chain of calls) to call the codeCatcher's Write. Therefore, neither the headers, and hence nor the the response code, were actually forwarded to the client. Consequently, this change moves the responsibility of actually forwarding the headers and response code to where it belongs, i.e. in WriteHeader. In addition, this change adds a wrapper of the codeCatcher, so that we can satisfy the CloseNotify interface as well. Fixes traefik#5385
traefiker
force-pushed
the
notmodified
branch
from
September 20, 2019 16:24
f05763c
to
4a9b78f
Compare
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Before this change, the codeCatcher relied on the fact that Write would
always be called, and hence was in charge of actually sending the headers
that WriteHeader had "cached" when it had been called.
However, in the case of e.g. a 304, since the response should not have
any body, there is no reason for the caller (i.e. another proxy or
middleware in the chain of calls) to call the codeCatcher's Write.
Therefore, neither the headers, and hence nor the the response code,
were actually forwarded to the client.
Consequently, this change moves the responsibility of actually
forwarding the headers and response code to where it belongs, i.e. in
WriteHeader.
In addition, this change adds a wrapper of the codeCatcher, so that we
can satisfy the CloseNotify interface as well.
N.B: in hindsight, I think it might be possible to reproduce #5385 even before 753d173 , if one is vicious enough to include the 304 code in the range of watched error codes.
Motivation
To properly handle 304 responses (and probably other headers related bugs lurking around).
More
[] Added/updated documentationAdditional Notes
Fixes #5385
Co-authored-by: Julien Salleyron julien.salleyron@gmail.com