Merge pull request #77 from l0gicgate/SetHeadersPreserveCase

Ensure Headers::setHeader preserves original case
slimphp · May 3, 2019 · c51f3a1 · c51f3a1
2 parents 61594b0 + d15f864
commit c51f3a1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Headers.php b/src/Headers.php
@@ -97,6 +97,12 @@ public function setHeader(string $name, $values): HeadersInterface
         $originalName = $this->normalizeHeaderName($name, true);
         $normalizedName = $this->normalizeHeaderName($name);
 
+        // Ensure we preserve original case if the header already exists in the stack
+        if (isset($this->headers[$normalizedName])) {
+            $existingHeader = $this->headers[$normalizedName];
+            $originalName = $existingHeader->getOriginalName();
+        }
+
         $this->headers[$normalizedName] = new Header($originalName, $normalizedName, $values);
 
         return $this;

diff --git a/tests/HeadersTest.php b/tests/HeadersTest.php
@@ -88,6 +88,18 @@ public function testSetHeader()
         $this->assertEquals(['Content-Length' => ['100']], $headers->getHeaders(true));
     }
 
+    public function testSetHeaderPreservesOriginalCaseIfHeaderAlreadyExists()
+    {
+        $headers = new Headers([
+            'CONTENT-LENGTH' => 0,
+        ]);
+
+        $headers->setHeader('Content-Length', 100);
+
+        $this->assertEquals(['content-length' => ['100']], $headers->getHeaders());
+        $this->assertEquals(['CONTENT-LENGTH' => ['100']], $headers->getHeaders(true));
+    }
+
     public function testSetHeaders()
     {
         $headers = new Headers([