Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 16:36:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Fixes #762. Wrong port replacement when https protocol is forced. Thanks to @lroellin for the feedback.

Browse Source
This commit is contained in:
nuxsmin
2017-10-17 08:59:36 +02:00
parent 2ff0fe000a
commit d3b35bea92
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inc/SP/Util/HttpUtil.class.php
View File

@@ -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']);
}
}

2
inc/SP/Util/Util.class.php
View File

@@ -386,7 +386,7 @@ class Util
*/
public static function getVersion($retBuild = false, $normalized = false)
{
$build = 17101301;
$build = 17101701;
$version = [2, 1, 15];
if ($normalized === true) {