lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3484 from GPCsolutions/https

Browse Source 
Qual: Don't attempt HTTPS redirect if already using HTTPS
This commit is contained in:
Laurent Destailleur 2015-09-09 20:09:38 +02:00
commit 870267316b
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/main.inc.php
View File

@ -225,7 +225,8 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
// Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
if (! empty($conf->file->main_force_https))
// $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
{
$newurl='';
if (is_numeric($conf->file->main_force_https))
@ -239,21 +240,13 @@ if (! empty($conf->file->main_force_https))
}
else // Check HTTPS environment variable (Apache/mod_ssl only)
{
// $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
if (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') // If link is http
{
$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
}
$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
}
}
else
{
// Check HTTPS environment variable (Apache/mod_ssl only)
// $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
if (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') // If link is http
{
$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
}
$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
}
// Start redirect
if ($newurl)