Skip to content
Snippets Groups Projects
Commit 87026731 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #3484 from GPCsolutions/https

Qual: Don't attempt HTTPS redirect if already using HTTPS
parents 42ac326f 92c08c77
No related branches found
No related tags found
No related merge requests found
...@@ -225,7 +225,8 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) ...@@ -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) // 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=''; $newurl='';
if (is_numeric($conf->file->main_force_https)) if (is_numeric($conf->file->main_force_https))
...@@ -238,23 +239,15 @@ if (! empty($conf->file->main_force_https)) ...@@ -238,23 +239,15 @@ if (! empty($conf->file->main_force_https))
} }
} }
else // Check HTTPS environment variable (Apache/mod_ssl only) 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 else
{ {
// Check HTTPS environment variable (Apache/mod_ssl only) // 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 // Start redirect
if ($newurl) if ($newurl)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment