Skip to content

Fix GH-15181: Disabled output handler is flushed again #15183

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 1 commit into from
Closed

Fix GH-15181: Disabled output handler is flushed again #15183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions main/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,10 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
);
#endif

if (handler->flags & PHP_OUTPUT_HANDLER_DISABLED) {
return PHP_OUTPUT_HANDLER_FAILURE;
}

if (php_output_lock_error(context->op)) {
/* fatal error */
return PHP_OUTPUT_HANDLER_FAILURE;
Expand Down
15 changes: 15 additions & 0 deletions tests/output/gh15181.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--TEST--
Fix GH-15181 (Disabled output handler is flushed again)
--FILE--
<?php
ob_start(function () {
throw new Exception('ob_start');
});
try {
ob_flush();
} catch (Throwable) {}
ob_flush();
?>
===DONE===
--EXPECT--
===DONE===
Loading