- headers normalization improvement

Author: kodeart

HeaderTrait.php

@@ -156,13 +156,15 @@ public function getCanonicalizedHeaders(array $names = []): string
      */
     protected function normalizeHeader(string $name, $value, bool $skipKey): void
     {
+        $name = trim($name);
+
         if (false === $skipKey) {
             $name = ucwords(str_replace('_', '-', strtolower($name)), '-');
         }
 
         $this->headersMap[strtolower($name)] = $name;
 
-        $this->headers[$name] = str_replace(["\r", "\n"], '', array_map('trim', (array)$value));
+        $this->headers[$name] = array_map('trim', (array)$value);
     }
 
     /**

Tests/HeaderTraitTest.php

@@ -170,6 +170,21 @@ public function test_canonicalized_headers_with_nonexistent_headers()
         ]), 'The last element is without a newline');
     }
 
+    public function test_normalizing_headers_key_and_value()
+    {
+        $this->SUT = $this->SUT->withHeaders([
+            "HTTP/1.1 401 Authorization Required\r\n" => "\r\n",
+            "cache-control\r\n" => " no-cache, no-store, must-revalidate, pre-check=0, post-check=0\r\n",
+            "x-xss-protection\r\n" => "0 \r\n"
+        ]);
+
+        $this->assertSame([
+            'Http/1.1 401 authorization required' => [''],
+            'Cache-Control' => ['no-cache, no-store, must-revalidate, pre-check=0, post-check=0'],
+            'X-Xss-Protection' => ['0']
+        ], $this->SUT->getHeaders());
+    }
+
     protected function setUp()
     {
         $this->SUT = new MockHttpHeader;