bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)

fabpot · fabpot · commit a0cdcb0ffbd6 · 2016-06-20T13:19:36.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpKernel] Dont close the reponse stream in debug | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19078 | License | MIT | Doc PR | - Because it's `terminate`'s job to clean the state, not the `Response`'s, and because the current behavior prevents getting any output on trailing errors on FPM especially. Commits ------- 2fbc200 [HttpKernel] Dont close the output stream in debug
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -373,12 +373,6 @@ public function send()
         $this->sendHeaders();
         $this->sendContent();
 
-        if (function_exists('fastcgi_finish_request')) {
-            fastcgi_finish_request();
-        } elseif ('cli' !== PHP_SAPI) {
-            static::closeOutputBuffers(0, true);
-        }
-
         return $this;
     }
 
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -149,6 +149,14 @@ public function terminate(Request $request, Response $response)
         }
 
         if ($this->getHttpKernel() instanceof TerminableInterface) {
+            if (!$this->debug) {
+                if (function_exists('fastcgi_finish_request')) {
+                    fastcgi_finish_request();
+                } elseif ('cli' !== PHP_SAPI) {
+                    Response::closeOutputBuffers(0, true);
+                }
+            }
+
             $this->getHttpKernel()->terminate($request, $response);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,14 @@ public function terminate(Request $request, Response $response)`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`if ($this->getHttpKernel() instanceof TerminableInterface) {`
	`152`	`+ if (!$this->debug) {`
	`153`	`+ if (function_exists('fastcgi_finish_request')) {`
	`154`	`+ fastcgi_finish_request();`
	`155`	`+ } elseif ('cli' !== PHP_SAPI) {`
	`156`	`+ Response::closeOutputBuffers(0, true);`
	`157`	`+ }`
	`158`	`+ }`
	`159`	`+`
`152`	`160`	`$this->getHttpKernel()->terminate($request, $response);`
`153`	`161`	`}`
`154`	`162`	`}`