makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix cookie secure detection... hopefully

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8737 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-08-01 14:29:18 +00:00
parent e47f088fa5
commit 2389388c46
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

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