* [FIX] Fixes #762. Wrong port replacement when https protocol is for…

…ced. Thanks to @lroellin for the feedback.
nuxsmin · Oct 17, 2017 · d3b35be · d3b35be
1 parent 2ff0fe0
commit d3b35be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/inc/SP/Util/HttpUtil.class.php b/inc/SP/Util/HttpUtil.class.php
@@ -39,10 +39,12 @@ class HttpUtil
     public static function checkHttps()
     {
         if (Checks::forceHttpsIsEnabled() && !Checks::httpsEnabled()) {
-            $port = ((int)$_SERVER['SERVER_PORT'] !== 443) ? ':' . $_SERVER['SERVER_PORT'] : '';
-            $host = str_replace('http', 'https', self::getHttpHost());
+            $serverPort = (int)$_SERVER['SERVER_PORT'];
 
-            header('Location: ' . $host . $port . $_SERVER['REQUEST_URI']);
+            $httpPort = $serverPort !== 443 && $serverPort !== 80 ? $serverPort : '';
+            $httpHost = str_replace('http', 'https', self::getHttpHost());
+
+            header('Location: ' . $httpHost . ':' . $httpPort . $_SERVER['REQUEST_URI']);
         }
     }
 

diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php
@@ -386,7 +386,7 @@ public static function getAppInfo($index = null)
      */
     public static function getVersion($retBuild = false, $normalized = false)
     {
-        $build = 17101301;
+        $build = 17101701;
         $version = [2, 1, 15];
 
         if ($normalized === true) {