Fix GH-8218: ob_end_clean does not reset Content-Encoding header #8353
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
The fix for phpGH-7953 introduced a regression by being to deliberate adding the respective headers. These must only be added, if the handler starts, but is not finalizing.
cmb69
commented
Apr 12, 2022
| @@ -311,7 +311,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c | |||
| mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE; | |||
| } | |||
|
|
|||
| if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START))) { | |||
| if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL)))) { | |||
There was a problem hiding this comment.
This could also be written as bit set operation; I'm not sure whether that would be more legible.
|
I'm not sure whether we should add regression tests for this. Unfortunately, the test runner does not support to check for missing headers, so we would need to set up a socket test. |
|
I've already seen it and everything looks good. GJ |
|
++ to get it in, got a report from alpinelinux about regression |
|
9bd468d is when it was broken |
|
If there are no objections, I'll merge this on monday at the latest. |
andypost
referenced
this pull request
Apr 21, 2022
If an output handler has not yet been started, calling `ob_clean()` causes it to start. If that happens, we must not forget to set the `Content-Encoding` and `Vary` headers. Closes GH-7960.
algitbot
pushed a commit
to alpinelinux/aports
that referenced
this pull request
Apr 22, 2022
algitbot
pushed a commit
to alpinelinux/aports
that referenced
this pull request
Apr 23, 2022
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.
The fix for GH-7953 introduced a regression by being to deliberate
adding the respective headers. These must only be added, if the
handler starts, but is not finalizing.