Fix #101: Don't duplicate Host header values when getallheaders() returns non-canonical casing

Author: samdark

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 3.2.2 under development
 
+- Bug #101: Don't duplicate `Host` header values when `getallheaders()` returns non-canonical casing (@samdark)
 - Bug #100: Don't route emitter failures through `ErrorCatcher` in `HttpApplicationRunner` (@samdark)
 - Enh #104: Apply PHP CS Fixer (@Tigrov)
 - Enh #103: Refactor `RequestFactory` (@Tigrov)

src/RequestFactory.php

@@ -14,7 +14,6 @@
 
 use function fopen;
 use function function_exists;
-use function getallheaders;
 use function is_array;
 use function preg_match;
 use function str_replace;
@@ -56,7 +55,7 @@ public function create(mixed $body = null): ServerRequestInterface
 
         // Add headers
         foreach ($this->getHeaders() as $name => $value) {
-            if ($name === 'Host' && $request->hasHeader('Host')) {
+            if (strtolower($name) === 'host' && $request->hasHeader('Host')) {
                 continue;
             }
             $request = $request->withAddedHeader($name, $value);
@@ -151,8 +150,7 @@ private function getHeaders(): array
     {
         /** @psalm-var array<string, string> $_SERVER */
 
-        if (function_exists('getallheaders') && ($headers = getallheaders()) !== false) {
-            /** @psalm-var array<string, string> $headers */
+        if (($headers = $this->getAllHeaders()) !== false) {
             return $headers;
         }
 
@@ -180,6 +178,24 @@ private function getHeaders(): array
         return $headers;
     }
 
+    /**
+     * @psalm-return array<string, string>|false
+     */
+    private function getAllHeaders(): array|false
+    {
+        if (function_exists(__NAMESPACE__ . '\getallheaders')) {
+            /** @psalm-var array<string, string>|false */
+            return getallheaders();
+        }
+
+        if (function_exists('getallheaders')) {
+            /** @psalm-var array<string, string>|false */
+            return getallheaders();
+        }
+
+        return false;
+    }
+
     private function normalizeHeaderName(string $name): string
     {
         return str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $name))));

tests/RequestFactory/RequestFactoryTest.php

@@ -18,15 +18,23 @@
 
 final class RequestFactoryTest extends TestCase
 {
+    public static array|false $getAllHeadersResult = false;
+
     private array $globalServer = [];
     private array $globalPost = [];
     private array $globalFiles = [];
 
+    public static function setUpBeforeClass(): void
+    {
+        require_once __DIR__ . '/getallheaders_stub.php';
+    }
+
     protected function setUp(): void
     {
         $this->globalServer = $_SERVER;
         $this->globalPost = $_POST;
         $this->globalFiles = $_FILES;
+        self::$getAllHeadersResult = false;
     }
 
     protected function tearDown(): void
@@ -36,6 +44,11 @@ protected function tearDown(): void
         $_FILES = $this->globalFiles;
     }
 
+    public static function getAllHeadersStubResult(): array|false
+    {
+        return self::$getAllHeadersResult;
+    }
+
     public function testUploadedFiles(): void
     {
         $_SERVER = [
@@ -93,6 +106,23 @@ public function testHeadersParsing(): void
         $this->assertSame($expected, $request->getHeaders());
     }
 
+    public function testHeadersFromGetAllHeadersDoNotDuplicateHost(): void
+    {
+        self::$getAllHeadersResult = [
+            'host' => 'example.com',
+            'X-Test' => 'header-value',
+        ];
+        $_SERVER = [
+            'HTTP_HOST' => 'example.com',
+            'REQUEST_METHOD' => 'GET',
+        ];
+
+        $request = $this->createRequestFactory()->create();
+
+        $this->assertSame(['example.com'], $request->getHeader('Host'));
+        $this->assertSame(['header-value'], $request->getHeader('X-Test'));
+    }
+
     public function testInvalidMethodException(): void
     {
         $_SERVER = [];

tests/RequestFactory/getallheaders_stub.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\Runner\Http;
+
+use function function_exists;
+
+if (!function_exists(__NAMESPACE__ . '\getallheaders')) {
+    function getallheaders(): array|false
+    {
+        return Tests\RequestFactory\RequestFactoryTest::getAllHeadersStubResult();
+    }
+}