review

dunglas · dunglas · commit 065b8fbfc37a · 2023-03-11T10:41:16.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -430,9 +430,6 @@ protected function sendEarlyHints(iterable $links, Response $response = null): R
         return $response;
     }
 
-    /**
-     * @internal
-     */
     private function populateEarlyHints(iterable $links): \Generator
     {
         foreach ($links as $link) {
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -351,21 +351,28 @@ public function sendHeaders(/* ?int $statusCode = null */): static
 
         // headers
         foreach ($this->headers->allPreserveCaseWithoutCookies() as $name => $values) {
-            $previousValues = $this->sentHeaders[$name] ?? null;
-            if ($previousValues === $values) {
-                // Header already sent in a previous response, it will be automatically copied in this response by PHP
-                continue;
-            }
+            $newValues = $values;
+            $replace = false;
+
+            // As recommended by RFC 8297, PHP automatically copies headers from previous 103 responses, we need to deal with that if headers changed
+            if (103 === $statusCode) {
+                $previousValues = $this->sentHeaders[$name] ?? null;
+                if ($previousValues === $values) {
+                    // Header already sent in a previous response, it will be automatically copied in this response by PHP
+                    continue;
+                }
 
-            $replace = 0 === strcasecmp($name, 'Content-Type');
+                $replace = 0 === strcasecmp($name, 'Content-Type');
+
+                if (null !== $previousValues && array_diff($previousValues, $values)) {
+                    header_remove($name);
+                    $previousValues = null;
+                }
 
-            if (null !== $previousValues && array_diff($previousValues, $values)) {
-                header_remove($name);
-                $previousValues = null;
+                $newValues = null === $previousValues ? $values : array_diff($values, $previousValues);
             }
 
-            $newValues = null === $previousValues ? $values : array_diff($values, $previousValues);
-            foreach ($newValues as $value) {
+            foreach ($newValues  as $value) {
                 header($name.': '.$value, $replace, $this->statusCode);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -430,9 +430,6 @@ protected function sendEarlyHints(iterable $links, Response $response = null): R`
`430`	`430`	`return $response;`
`431`	`431`	`}`
`432`	`432`
`433`		`- /**`
`434`		`- * @internal`
`435`		`- */`
`436`	`433`	`private function populateEarlyHints(iterable $links): \Generator`
`437`	`434`	`{`
`438`	`435`	`foreach ($links as $link) {`