Merge pull request #101 from clue-labs/headers-case

Fix merging default headers if overwritten with custom case headers
reactphp · Jun 26, 2017 · b48b088 · b48b088
2 parents c1374e0 + 0a071cc
commit b48b088
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/RequestData.php b/src/RequestData.php
@@ -23,15 +23,24 @@ private function mergeDefaultheaders(array $headers)
         $connectionHeaders = ('1.1' === $this->protocolVersion) ? array('Connection' => 'close') : array();
         $authHeaders = $this->getAuthHeaders();
 
-        return array_merge(
+        $defaults = array_merge(
             array(
                 'Host'          => $this->getHost().$port,
                 'User-Agent'    => 'React/alpha',
             ),
             $connectionHeaders,
-            $authHeaders,
-            $headers
+            $authHeaders
         );
+
+        // remove all defaults that already exist in $headers
+        $lower = array_change_key_case($headers, CASE_LOWER);
+        foreach ($defaults as $key => $_) {
+            if (isset($lower[strtolower($key)])) {
+                unset($defaults[$key]);
+            }
+        }
+
+        return array_merge($defaults, $headers);
     }
 
     public function getScheme()

diff --git a/tests/RequestDataTest.php b/tests/RequestDataTest.php
@@ -106,6 +106,23 @@ public function toStringReturnsHTTPRequestMessageWithHeaders()
         $this->assertSame($expected, $requestData->__toString());
     }
 
+    /** @test */
+    public function toStringReturnsHTTPRequestMessageWithHeadersInCustomCase()
+    {
+        $requestData = new RequestData('GET', 'http://www.example.com', array(
+            'user-agent' => 'Hello',
+            'LAST' => 'World'
+        ));
+
+        $expected = "GET / HTTP/1.0\r\n" .
+            "Host: www.example.com\r\n" .
+            "user-agent: Hello\r\n" .
+            "LAST: World\r\n" .
+            "\r\n";
+
+        $this->assertSame($expected, $requestData->__toString());
+    }
+
     /** @test */
     public function toStringReturnsHTTPRequestMessageWithProtocolVersionThroughConstructor()
     {