diff --git a/ChangeLog b/ChangeLog index f314a5267..046dee130 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ $Source$ 2003-11-03 Michal Cihar * lang/czech: Updated. + * libraries/common.lib.php3: URI detection works with www-Sharp.Runtime + (RFE #834053). 2003-11-03 Alexander M. Turek * lang/german-*.inc.php3: Grammar. diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 08f556b76..a3c64258b 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -665,9 +665,16 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} if (isset(${$SERVER_ARRAY}['PATH_INFO'])) { $PATH_INFO = ${$SERVER_ARRAY}['PATH_INFO']; } + if (isset(${$SERVER_ARRAY}['HTTP_SCHEME'])) { + $HTTP_SCHEME = ${$SERVER_ARRAY}['HTTP_SCHEME']; + } + if (!empty($HTTP_SCHEME)) { + $cfg['PmaAbsoluteUri'] = $HTTP_SCHEME . '://'; + } else { + $cfg['PmaAbsoluteUri'] = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . '://'; + } $port_in_HTTP_HOST = (strpos($HTTP_HOST, ':') > 0); - $cfg['PmaAbsoluteUri'] = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . '://' - . $HTTP_HOST; + $cfg['PmaAbsoluteUri'] .= $HTTP_HOST; // if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443" // to the generated URL -> prevents a double password query in case of http authentication.