Skip to content

Clear output handler status flags during handler initialization #13087

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

Closed
wants to merge 5 commits into from
Closed

Clear output handler status flags during handler initialization #13087

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b67f59b
Clear handler status flag in handler init
Jan 7, 2024
283f013
Change flags clearing to a macro function
Jan 10, 2024
e05a75e
Add status flag erasure test
Jan 10, 2024
ab50258
Update handler type in test
Jan 12, 2024
ef76c10
UPGRADING
Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ PHPAPI php_output_handler *php_output_handler_create_user(zval *output_handler,
default:
user = ecalloc(1, sizeof(php_output_handler_user_func_t));
if (SUCCESS == zend_fcall_info_init(output_handler, 0, &user->fci, &user->fcc, &handler_name, &error)) {
handler = php_output_handler_init(handler_name, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_USER);
handler = php_output_handler_init(handler_name, chunk_size, (flags & ~0xf00f) | PHP_OUTPUT_HANDLER_USER);
ZVAL_COPY(&user->zoh, output_handler);
handler->func.user = user;
} else {
Expand All @@ -504,7 +504,7 @@ PHPAPI php_output_handler *php_output_handler_create_internal(const char *name,
php_output_handler *handler;
zend_string *str = zend_string_init(name, name_len, 0);

handler = php_output_handler_init(str, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_INTERNAL);
handler = php_output_handler_init(str, chunk_size, (flags & ~0xf00f) | PHP_OUTPUT_HANDLER_INTERNAL);
handler->func.internal = output_handler;
zend_string_release_ex(str, 0);

Expand Down