Resolves #2705: add explicit set of path component to generated request uris

Author: David Alger

app/code/Magento/PageCache/Model/Cache/Server.php

@@ -5,16 +5,17 @@
  */
 namespace Magento\PageCache\Model\Cache;
 
-use Zend\Uri\Uri;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\RequestInterface;
+use Zend\Uri\Uri;
 use Zend\Uri\UriFactory;
 
 class Server
 {
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlBuilder;
 
@@ -33,12 +34,12 @@ class Server
     /**
      * Constructor
      *
-     * @param \Magento\Framework\UrlInterface $urlBuilder
+     * @param UrlInterface $urlBuilder
      * @param DeploymentConfig $config
      * @param RequestInterface $request
      */
     public function __construct(
-        \Magento\Framework\UrlInterface $urlBuilder,
+        UrlInterface $urlBuilder,
         DeploymentConfig $config,
         RequestInterface $request
     ) {
@@ -56,21 +57,25 @@ public function getUris()
     {
         $servers = [];
         $configuredHosts = $this->config->get(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS);
-        if (null == $configuredHosts) {
-            $httpHost = $this->request->getHttpHost();
-            $servers[] = $httpHost ?
-                UriFactory::factory('')->setHost($httpHost)->setPort(self::DEFAULT_PORT)->setScheme('http') :
-                UriFactory::factory($this->urlBuilder->getUrl('*', ['_nosid' => true])) // Don't use SID in building URL
-                    ->setScheme('http')
-                    ->setPath(null)
-                    ->setQuery(null);
 
-        } else {
+        if (is_array($configuredHosts)) {
             foreach ($configuredHosts as $host) {
-                $servers[] = UriFactory::factory('')->setHost($host['host'])
+                $servers[] = UriFactory::factory('')
+                    ->setHost($host['host'])
                     ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT)
-                    ->setScheme('http');
+                ;
             }
+        } elseif ($this->request->getHttpHost()) {
+            $servers[] = UriFactory::factory('')->setHost($this->request->getHttpHost())->setPort(self::DEFAULT_PORT);
+        } else {
+            $servers[] = UriFactory::factory($this->urlBuilder->getUrl('*', ['_nosid' => true]));
+        }
+
+        foreach ($servers as $key => $value) {
+            $servers[$key]->setScheme('http')
+                ->setPath('/')
+                ->setQuery(null)
+            ;
         }
         return $servers;
     }