redirection to different domain must not keep previous port

Author: dbu

CHANGELOG.md

@@ -4,7 +4,8 @@
 
 ### Fixed
 
-- Fixes false positive circular detection in RedirectPlugin in cases when target location does not contain path
+- [RedirectPlugin] Fixed handling of redirection to different domain with default port
+- [RedirectPlugin] Fixed false positive circular detection in RedirectPlugin in cases when target location does not contain path
 
 ## 2.5.0 - 2021-11-26
 

src/Plugin/RedirectPlugin.php

@@ -247,6 +247,8 @@ private function createUri(ResponseInterface $redirectResponse, RequestInterface
 
         if (array_key_exists('port', $parsedLocation)) {
             $uri = $uri->withPort($parsedLocation['port']);
+        } elseif (array_key_exists('host', $parsedLocation)) {
+            $uri = $uri->withPort(null);
         }
 
         return $uri;

tests/Plugin/RedirectPluginTest.php

@@ -30,6 +30,8 @@ function () {}
      * @testWith ["https://example.com/path?query=value", "https://example.com?query=value", "https://example.com?query=value"]
      *           ["https://example.com/path?query=value", "https://example.com/?query=value", "https://example.com/?query=value"]
      *           ["https://example.com", "https://example.com?query=value", "https://example.com?query=value"]
+     *           ["https://example.com:8000", "https://foo.com?query=value", "https://foo.com?query=value"]
+     *           ["https://example.com:8000", "/path?query=value", "https://example.com:8000/path?query=value"]
      */
     public function testTargetUriMappingFromLocationHeader(string $originalUri, string $locationUri, string $targetUri): void
     {