[HttpFoundation][Runtime] Do not call *_finish_request() functions when debug mode is on

fancyweb · fancyweb · commit 8da05da7739c · 2023-10-17T08:06:22.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Support root-level `Generator` in `StreamedJsonResponse`
  * Add `UriSigner` from the HttpKernel component
  * Add `partitioned` flag to `Cookie` (CHIPS Cookie)
+ * Add argument `bool $finishRequest = true` to `Response::send()`
 
 6.3
 ---
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -415,16 +415,19 @@ public function sendContent(): static
     /**
      * Sends HTTP headers and content.
      *
+     * @param bool $finishRequest Whether fastcgi_finish_request() and alike functions should be called
+     *
      * @return $this
      */
-    public function send(): static
+    public function send(/* bool $finishRequest = true */): static
     {
         $this->sendHeaders();
         $this->sendContent();
 
-        if (\function_exists('fastcgi_finish_request')) {
+        $finishRequest = 1 <= \func_num_args() ? func_get_arg(0) : true;
+        if (\function_exists('fastcgi_finish_request') && $finishRequest) {
             fastcgi_finish_request();
-        } elseif (\function_exists('litespeed_finish_request')) {
+        } elseif (\function_exists('litespeed_finish_request') && $finishRequest) {
             litespeed_finish_request();
         } elseif (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
             static::closeOutputBuffers(0, true);
diff --git a/src/Symfony/Component/Runtime/CHANGELOG.md b/src/Symfony/Component/Runtime/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.4
+---
+
+ * Add argument `bool $debug = false` to `HttpKernelRunner::__construct()`
+
 5.4
 ---
 
diff --git a/src/Symfony/Component/Runtime/Runner/Symfony/HttpKernelRunner.php b/src/Symfony/Component/Runtime/Runner/Symfony/HttpKernelRunner.php
@@ -24,13 +24,14 @@ class HttpKernelRunner implements RunnerInterface
     public function __construct(
         private readonly HttpKernelInterface $kernel,
         private readonly Request $request,
+        private readonly bool $debug = false,
     ) {
     }
 
     public function run(): int
     {
         $response = $this->kernel->handle($this->request);
-        $response->send();
+        $response->send(!$this->debug);
 
         if ($this->kernel instanceof TerminableInterface) {
             $this->kernel->terminate($this->request, $response);
diff --git a/src/Symfony/Component/Runtime/SymfonyRuntime.php b/src/Symfony/Component/Runtime/SymfonyRuntime.php
@@ -131,7 +131,7 @@ public function __construct(array $options = [])
     public function getRunner(?object $application): RunnerInterface
     {
         if ($application instanceof HttpKernelInterface) {
-            return new HttpKernelRunner($application, Request::createFromGlobals());
+            return new HttpKernelRunner($application, Request::createFromGlobals(), $this->options['debug'] ?? false);
         }
 
         if ($application instanceof Response) {

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,14 @@ class HttpKernelRunner implements RunnerInterface`
`24`	`24`	`public function __construct(`
`25`	`25`	`private readonly HttpKernelInterface $kernel,`
`26`	`26`	`private readonly Request $request,`
	`27`	`+ private readonly bool $debug = false,`
`27`	`28`	`) {`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public function run(): int`
`31`	`32`	`{`
`32`	`33`	`$response = $this->kernel->handle($this->request);`
`33`		`- $response->send();`
	`34`	`+ $response->send(!$this->debug);`
`34`	`35`
`35`	`36`	`if ($this->kernel instanceof TerminableInterface) {`
`36`	`37`	`$this->kernel->terminate($this->request, $response);`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public function __construct(array $options = [])`
`131`	`131`	`public function getRunner(?object $application): RunnerInterface`
`132`	`132`	`{`
`133`	`133`	`if ($application instanceof HttpKernelInterface) {`
`134`		`- return new HttpKernelRunner($application, Request::createFromGlobals());`
	`134`	`+ return new HttpKernelRunner($application, Request::createFromGlobals(), $this->options['debug'] ?? false);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if ($application instanceof Response) {`