github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-02 21:59:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated attachment download to check OB before cleaning it

Browse Source 
Call to `ob_end_clean` would error if the environment did not use the
PHP `output_buffering` option. This adds an additional check and updates
the comment to be more specific to the exact scenario of the condition.
Tested with output_buffering=Off and output_buffering=4096

Closes #3415
This commit is contained in:
Dan Brown 2022-05-09 15:25:06 +01:00
parent b855bbaaea
commit 2a99e23e6d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Controller.php
View File

@ -127,9 +127,11 @@ abstract class Controller extends BaseController
protected function streamedDownloadResponse($stream, string $fileName): StreamedResponse
{
return response()->stream(function () use ($stream) {
// End & flush the output buffer otherwise we still seem to use memory.
// End & flush the output buffer, if we're in one, otherwise we still use memory.
// Output buffer may or may not exist depending on PHP `output_buffering` setting.
// Ignore in testing since output buffers are used to gather a response.
if (!app()->runningUnitTests()) {
if (!empty(ob_get_status()) && !app()->runningUnitTests()) {
ob_end_clean();
}