Fix server crash when header with only digits in name sended

luzrain · Mar 15, 2024 · 0026c7a · 0026c7a
1 parent 1922714
commit 0026c7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -27,5 +27,10 @@
                 <directory name="src" />
             </errorLevel>
         </PropertyNotSetInConstructor>
+        <RedundantCastGivenDocblockType>
+            <errorLevel type="suppress">
+                <directory name="src" />
+            </errorLevel>
+        </RedundantCastGivenDocblockType>
     </issueHandlers>
 </psalm>
diff --git a/src/Server/Http/Psr7/MessageTrait.php b/src/Server/Http/Psr7/MessageTrait.php
@@ -141,14 +141,15 @@ public function withBody(StreamInterface $body): MessageInterface
     private function setHeaders(array $headers): void
     {
         foreach ($headers as $name => $value) {
+            $name = (string) $name;
             $normalizedName = $this->normalizeHeaderName($name);
-            $value = $this->normalizeHeaderValue($value);
+            $values = $this->normalizeHeaderValue($value);
             if (isset($this->headerNames[$normalizedName])) {
                 $name = $this->headerNames[$normalizedName];
-                $this->headers[$name] = \array_merge($this->headers[$name], $value);
+                $this->headers[$name] = \array_merge($this->headers[$name], $values);
             } else {
                 $this->headerNames[$normalizedName] = $name;
-                $this->headers[$name] = $value;
+                $this->headers[$name] = $values;
             }
         }
     }