Merge branch '2.3' into 2.4

* 2.3: Check headers sent before sending PHP response Fixed ACE domain checks on UrlValidator (#10031) handle array root element
Check headers sent before sending PHP response
2026-03-25 01:32:09 +01:00 · 2014-03-26 19:07:42 +01:00 · 2014-03-26 19:06:50 +01:00 · 2014-03-01 18:35:04 +01:00 · 2014-03-01 18:25:29 +01:00
2 changed files with 6 additions and 4 deletions
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -91,9 +91,11 @@ class ExceptionHandler
            $exception = FlattenException::create($exception);
        }

-        header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));
-        foreach ($exception->getHeaders() as $name => $value) {
-            header($name.': '.$value, false);
+        if (!headers_sent()) {
+            header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));
+            foreach ($exception->getHeaders() as $name => $value) {
+                header($name.': '.$value, false);
+            }
        }

        echo $this->decorate($this->getContent($exception), $this->getStylesheet($exception));
--- a/Tests/Exception/FlattenExceptionTest.php
+++ b/Tests/Exception/FlattenExceptionTest.php
@@ -113,7 +113,7 @@ class FlattenExceptionTest extends \PHPUnit_Framework_TestCase

        $this->assertEquals($exception->getMessage(), $flattened->getMessage(), 'The message is copied from the original exception.');
        $this->assertEquals($exception->getCode(), $flattened->getCode(), 'The code is copied from the original exception.');
-        $this->assertEquals(get_class($exception), $flattened->getClass(), 'The class is set to the class of the original exception');
+        $this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');

    }
Author	SHA1	Message	Date
Fabien Potencier	cf012d37f7	Merge branch '2.3' into 2.4 * 2.3: Check headers sent before sending PHP response Fixed ACE domain checks on UrlValidator (#10031) handle array root element	2014-03-26 19:07:42 +01:00
Jerome TAMARELLE	3c1b5f218d	Check headers sent before sending PHP response If the response contents has been sent before an error occurs, PHP triggers the warning "Cannot modify header information - headers already sent" This change ensure that the error message is echoed, while it's impossible to change the HTTP status code and headers.	2014-03-26 19:06:50 +01:00
Fabien Potencier	412b76458b	Merge branch '2.3' into 2.4 * 2.3: changed some PHPUnit assertions to more specific ones fixed Kernel::stripComments() normalizing new-lines added a BC comment Update FileLoader to fix issue #10339	2014-03-01 18:35:04 +01:00
Fabien Potencier	78dc94dce6	changed some PHPUnit assertions to more specific ones	2014-03-01 18:25:29 +01:00