From b288f5dae58522c1cb5e3221803eed8eec0abf8a Mon Sep 17 00:00:00 2001
From: Nattfarinn <nattfarinn@gmail.com>
Date: Tue, 6 Dec 2016 14:48:23 +0100
Subject: [PATCH] EZS-1129: Siteaccess preview fails with SSL configuration

---
 SiteAccess/ReverseMatcher.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SiteAccess/ReverseMatcher.php b/SiteAccess/ReverseMatcher.php
index 71bb51a..ac03ccd 100644
--- a/SiteAccess/ReverseMatcher.php
+++ b/SiteAccess/ReverseMatcher.php
@@ -66,7 +66,7 @@ public function getUrlParts($siteAccessName)
         $masterRequest = $this->requestStack->getMasterRequest();

         return [
-            'scheme' => $request->scheme ?: 'http',
+            'scheme' => $request->scheme ?: $masterRequest->getScheme(),
             'host' => $request->host ?: $masterRequest->getHost(),
             'port' => $request->port ?: $masterRequest->getPort(),
             'uri' => $request->pathinfo,
@@ -83,7 +83,7 @@ public function getSiteAccessDomains()
             $domains[] = sprintf('%s://%s%s',
                 $parts['scheme'],
                 $parts['host'],
-                $parts['port'] !== 80 ? ":{$parts['port']}" : ''
+                !in_array($parts['port'], [80, 443]) ? ":{$parts['port']}" : ''
             );
         }

@@ -97,7 +97,7 @@ public function getUrlRoot($siteAccessName)
         return sprintf('%s://%s%s%s',
             $parts['scheme'],
             $parts['host'],
-            $parts['port'] !== 80 ? ":{$parts['port']}" : '',
+            !in_array($parts['port'], [80, 443]) ? ":{$parts['port']}" : '',
             $parts['uri']
         );
     }