bug #47434 [HttpFoundation] move flushing outside of Response::closeOutputBuffers (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit fc1c9be06b15 · 2022-08-30T18:46:14.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpFoundation] move flushing outside of Response::closeOutputBuffers | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Fix change introduced in #46931 Commits ------- 118acea [HttpFoundation] move flushing outside of Response::closeOutputBuffers
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -384,6 +384,7 @@ public function send()
             fastcgi_finish_request();
         } elseif (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
             static::closeOutputBuffers(0, true);
+            flush();
         }
 
         return $this;
@@ -1236,7 +1237,6 @@ public static function closeOutputBuffers(int $targetLevel, bool $flush): void
         while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || ($s['flags'] & $flags) === $flags : $s['del'])) {
             if ($flush) {
                 ob_end_flush();
-                flush();
             } else {
                 ob_end_clean();
             }

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,7 @@ public function send()`
`384`	`384`	`fastcgi_finish_request();`
`385`	`385`	`} elseif (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`386`	`386`	`static::closeOutputBuffers(0, true);`
	`387`	`+ flush();`
`387`	`388`	`}`
`388`	`389`
`389`	`390`	`return $this;`
`@@ -1236,7 +1237,6 @@ public static function closeOutputBuffers(int $targetLevel, bool $flush): void`
`1236`	`1237`	`while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) \|\| ($s['flags'] & $flags) === $flags : $s['del'])) {`
`1237`	`1238`	`if ($flush) {`
`1238`	`1239`	`ob_end_flush();`
`1239`		`- flush();`
`1240`	`1240`	`} else {`
`1241`	`1241`	`ob_end_clean();`
`1242`	`1242`	`}`