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

fix: request handler output buffer handling #423

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: request handler output buffer handling #423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d707208
fix: request handler output buffer handling
RafaelKr Dec 16, 2024
afc3b98
Merge branch 'main' into fix/request-handler-output-buffer
retlehs Dec 21, 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
56 changes: 37 additions & 19 deletions src/Roots/Acorn/Application/Concerns/Bootable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,33 +143,37 @@ protected function enableHttpsInConsole(): void
*/
protected function registerWordPressRoute(): void
{
Route::any('{any?}', fn () => tap(response(''), function (Response $response) {
foreach (headers_list() as $header) {
[$header, $value] = preg_split("/:\s{0,1}/", $header, 2);
Route::any('{any?}', fn (Request $request) => tap(
response(''),
function (Response $response) use ($request) {
foreach (headers_list() as $header) {
[$header, $value] = preg_split("/:\s{0,1}/", $header, 2);

if (! headers_sent()) {
header_remove($header);
}
if (! headers_sent()) {
header_remove($header);
}

$response->header($header, $value, $header !== 'Set-Cookie');
}
$response->header($header, $value, $header !== 'Set-Cookie');
}

if ($this->hasDebugModeEnabled()) {
$response->header('X-Powered-By', $this->version());
}
if ($this->hasDebugModeEnabled()) {
$response->header('X-Powered-By', $this->version());
}

$response->setStatusCode(http_response_code());
$response->setStatusCode(http_response_code());

$content = '';
// Get the output buffer contents from our shutdown handler
$content = $request->request->get('wp_ob_content');

$levels = ob_get_level();
$levels = ob_get_level();

for ($i = 0; $i < $levels; $i++) {
$content .= ob_get_clean();
}
for ($i = 0; $i < $levels; $i++) {
$content .= ob_get_contents();
}

$response->setContent($content);
}))
$response->setContent($content);
})
)
->where('any', '.*')
->name('wordpress');
}
Expand Down Expand Up @@ -220,9 +224,23 @@ protected function registerRequestHandler(

$route->middleware('wordpress');

// We need to save our start level as there might be higher level output buffer handlers due to caching plugins.
$startLevel = ob_get_level();
ob_start();

remove_action('shutdown', 'wp_ob_end_flush_all', 1);
add_action('shutdown', function () use ($request, $startLevel) {
// Clean buffer only until our start level, keep possible higher level buffers to their handlers
$levels = ob_get_level() - $startLevel;
$content = '';

for ($i = 0; $i < $levels; $i++) {
$content .= ob_get_clean();
}

// Save content onto request to have it available in the Response handler
$request->request->set('wp_ob_content', $content);
}, 1);
add_action('shutdown', fn () => $this->handleRequest($request), 100);
}

Expand Down
Loading