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

URI detection works with www-Sharp.Runtime (RFE #834053).

Browse Source
This commit is contained in:
Michal Čihař
2003-11-03 14:27:50 +00:00
parent 929dc1ef1c
commit 78a8356741
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2003-11-03 Michal Cihar <nijel@users.sourceforge.net> 2003-11-03 Michal Cihar <nijel@users.sourceforge.net>
* lang/czech: Updated. * lang/czech: Updated.
* libraries/common.lib.php3: URI detection works with www-Sharp.Runtime
(RFE #834053).
2003-11-03 Alexander M. Turek <rabus@users.sourceforge.net> 2003-11-03 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/german-*.inc.php3: Grammar. * lang/german-*.inc.php3: Grammar.

11
libraries/common.lib.php3
View File

@@ -665,9 +665,16 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
if (isset(${$SERVER_ARRAY}['PATH_INFO'])) { if (isset(${$SERVER_ARRAY}['PATH_INFO'])) {
$PATH_INFO = ${$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); $port_in_HTTP_HOST = (strpos($HTTP_HOST, ':') > 0);
$cfg['PmaAbsoluteUri'] = ((!empty($HTTPS) && strtolower($HTTPS) != 'off') ? 'https' : 'http') . '://' $cfg['PmaAbsoluteUri'] .= $HTTP_HOST;
. $HTTP_HOST;
// if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443" // 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. // to the generated URL -> prevents a double password query in case of http authentication.