MAGECLOUD-2556: Deploy failed when try to setup redirecting naked dom…

…ain to www (#327)
magento · Aug 2, 2018 · 2d3cf26 · 2d3cf26
1 parent 4a079d0
commit 2d3cf26
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/Test/Unit/Util/UrlManagerTest.php b/src/Test/Unit/Util/UrlManagerTest.php
@@ -317,6 +317,34 @@ public function returnedDataProvider()
                     ],
                 ],
             ],
+            'domain with www by default' => [
+                'routes' => [
+                    'http://example.com/' => ['original_url' => 'http://www.{default}/', 'type' => 'upstream'],
+                    'https://example.com/' => ['original_url' => 'https://www.{default}/', 'type' => 'upstream'],
+                    'http://*.example.com/' => ['original_url' => 'http://*.{default}/', 'type' => 'upstream'],
+                    'https://*.example.com/' => ['original_url' => 'https://*.{default}/', 'type' => 'upstream'],
+                    'http://french.example.com/' => [
+                        'original_url' => 'http://french.{default}/',
+                        'type' => 'upstream',
+                    ],
+                    'https://french.example.com/' => [
+                        'original_url' => 'https://french.{default}/',
+                        'type' => 'upstream',
+                    ],
+                ],
+                [
+                    'secure' => [
+                        '' => 'https://example.com/',
+                        '*' => 'https://*.example.com/',
+                        'french' => 'https://french.example.com/',
+                    ],
+                    'unsecure' => [
+                        '' => 'http://example.com/',
+                        '*' => 'http://*.example.com/',
+                        'french' => 'http://french.example.com/',
+                    ],
+                ],
+            ],
         ];
     }
 

diff --git a/src/Util/UrlManager.php b/src/Util/UrlManager.php
@@ -61,7 +61,7 @@ private function parseRoutes(array $routes): array
             }
 
             $host = parse_url($val['original_url'], PHP_URL_HOST);
-            $originalUrlRegEx = sprintf('/\.?%s/', preg_quote(self::MAGIC_ROUTE));
+            $originalUrlRegEx = sprintf('/(www)?\.?%s/', preg_quote(self::MAGIC_ROUTE));
             $originalUrl = preg_replace($originalUrlRegEx, '', $host);
 
             if (strpos($key, self::PREFIX_UNSECURE) === 0) {