The default port 80 and 443 are not removed if includePortInHostHeader is true

Author: ezimuel

src/Elasticsearch/Connections/Connection.php

@@ -200,9 +200,7 @@ public function performRequest(string $method, string $uri, ?array $params = [],
 
         $host = $this->host;
         if (isset($this->connectionParams['client']['port_in_header']) && $this->connectionParams['client']['port_in_header']) {
-            if (!in_array((int) $this->port, [80,443])) {
-                $host .= ':' . $this->port;
-            }
+            $host .= ':' . $this->port;
         }
 
         $request = [

tests/Elasticsearch/Tests/ClientBuilderTest.php

@@ -71,23 +71,13 @@ public function testElasticCloudIdNotOverrideCurlEncoding()
         }
     }
 
-    public function getHttpPorts()
-    {
-        return [
-            [ 80, false ],  // not included since 80 is standard port for HTTP
-            [ 443, false ], // not included since 442 is standard port for HTTPS
-            [ 1234, true ]  // included since 1234 is not a standard port
-        ];
-    }
-
     /**
-     * @dataProvider getHttpPorts
      * @see https://github.com/elastic/elasticsearch-php/issues/993
      */
-    public function testIncludePortInHostHeader(int $port, bool $included)
+    public function testIncludePortInHostHeader()
     {
         $host = "localhost";
-        $url = "localhost:$port";
+        $url = "$host:1234";
         $params = [
             'client' => [
                 'verbose' => true
@@ -106,14 +96,14 @@ public function testIncludePortInHostHeader(int $port, bool $included)
         } catch (ElasticsearchException $e) {
             $request = $client->transport->getLastConnection()->getLastRequestInfo();
             $this->assertTrue(isset($request['request']['headers']['Host'][0]));
-            $this->assertEquals($included ? $url : $host, $request['request']['headers']['Host'][0]);
+            $this->assertEquals($url, $request['request']['headers']['Host'][0]);
         }
     }
 
     /**
      * @see https://github.com/elastic/elasticsearch-php/issues/993
      */
-    public function testNotIncludeStandardPortInHostHeaderAsDefault()
+    public function testNotIncludePortInHostHeaderAsDefault()
     {
         $host = "localhost";
         $url  = "$host:1234";
@@ -141,7 +131,7 @@ public function testNotIncludeStandardPortInHostHeaderAsDefault()
     /**
      * @see https://github.com/elastic/elasticsearch-php/issues/993
      */
-    public function testNotIncludeStandardPortInHostHeader()
+    public function testNotIncludePortInHostHeader()
     {
         $host = "localhost";
         $url  = "$host:1234";