Skip to content

Commit bfe4671

Browse files
fix merge
1 parent d0c1835 commit bfe4671

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/Symfony/Bridge/PsrHttpMessage/Factory/PsrHttpFactory.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,11 @@ public function createResponse(Response $symfonyResponse): ResponseInterface
167167
return '';
168168
}, 1);
169169

170-
$symfonyResponse->sendContent();
171-
ob_end_clean();
170+
try {
171+
$symfonyResponse->sendContent();
172+
} finally {
173+
ob_end_clean();
174+
}
172175
} else {
173176
$stream->write($symfonyResponse->getContent());
174177
}

src/Symfony/Component/HttpKernel/HttpKernelBrowser.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ protected function filterResponse(object $response): DomResponse
183183
$content = '';
184184
ob_start(static function ($chunk) use (&$content) {
185185
$content .= $chunk;
186+
187+
return '';
186188
});
187189

188190
try {

0 commit comments

Comments
 (0)