mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 03:54:56 +02:00
Code Issues Releases Wiki Activity

merge cookie secure detection

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8738 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-08-01 14:30:42 +00:00
parent 48701289ff
commit 1071d9cb31
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/functions.php
View File

@ -1715,6 +1715,7 @@ function generate_board_url($without_script_path = false)
$script_path = $config['script_path'];
$url = $server_protocol . $server_name;
$cookie_secure = $config['cookie_secure'];
}
else
{
@ -1725,7 +1726,7 @@ function generate_board_url($without_script_path = false)
$script_path = $user->page['root_script_path'];
}
if ($server_port && (($config['cookie_secure'] && $server_port <> 443) || (!$config['cookie_secure'] && $server_port <> 80)))
if ($server_port && (($cookie_secure && $server_port <> 443) || (!$cookie_secure && $server_port <> 80)))
{
// HTTP HOST can carry a port number (we fetch $user->host, but for old versions this may be true)
if (strpos($server_name, ':') === false)