nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-07-11 Robin Johnson <robbat2@users.sourceforge.net>

Browse Source 
* libraries/common.inc.php3: Fix for case where HTTP_HOST contains
      the port already, as adding HTTP_PORT is wrong then.
This commit is contained in:
Robin Johnson
2002-07-11 07:59:42 +00:00
parent 8d9afd92bb
commit ec375cd11d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-07-11 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/common.inc.php3: Fix for case where HTTP_HOST contains
the port already, as adding HTTP_PORT is wrong then.
2002-07-10 Marc Delisle <lem9@users.sourceforge.net>
* libraries/charset_conversion.lib.php3: wrong function called,
thanks to Michal Cihar

3
libraries/common.lib.php3
View File

@@ -522,9 +522,10 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
// work anyway, but display a big warning on the main.php3
// page.
if (empty($cfg['PmaAbsoluteUri'])) {
$port_in_HTTP_HOST = strpos($HTTP_SERVER_VARS['HTTP_HOST'],':') !== FALSE;
$cfg['PmaAbsoluteUri'] = (!empty($HTTP_SERVER_VARS['HTTPS']) ? 'https' : 'http') . '://'
. $HTTP_SERVER_VARS['HTTP_HOST']
. (!empty($HTTP_SERVER_VARS['SERVER_PORT']) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '')
. ((!empty($HTTP_SERVER_VARS['SERVER_PORT']) && !$port_in_HTTP_HOST) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '')
. substr($PHP_SELF, 0, strrpos($PHP_SELF, '/') + 1);
// We display the warning by default, but not if it is disabled thru
// via the $cfg['PmaAbsoluteUri_DisableWarning'] variable.