archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk;bug fix 1024 : the way to discover protocol (http/https) was not correct

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.0@3404 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2009-06-09 15:55:21 +00:00
parent ccc032c809
commit 50114c64f0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/functions_url.inc.php
View file

@ -58,13 +58,14 @@ function get_absolute_root_url($with_scheme=true)
$url = '';
if ($with_scheme)
{
if (empty($_SERVER['HTTPS']))
if (isset($_SERVER['HTTPS']) &&
((strtolower($_SERVER['HTTPS']) == 'on') or ($_SERVER['HTTPS'] == 1)))
{
$url .= 'http://';
$url .= 'https://';
}
else
{
$url .= 'https://';
$url .= 'http://';
}
$url .= $_SERVER['HTTP_HOST'];
if ($_SERVER['SERVER_PORT'] != 80)