patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard
This commit is contained in:
@@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
|||||||
|
|
||||||
2.11.2.0 (not yet released)
|
2.11.2.0 (not yet released)
|
||||||
- patch #1787915 Avoid CSS reloading on every click, thanks to Juergen Wind
|
- patch #1787915 Avoid CSS reloading on every click, thanks to Juergen Wind
|
||||||
|
- patch #1791576 HTTP auth: support REDIRECT_REMOTE_USER, thanks to Allard
|
||||||
|
|
||||||
2.11.1.0 (not yet released)
|
2.11.1.0 (not yet released)
|
||||||
|
|
||||||
|
@@ -101,16 +101,19 @@ function PMA_auth_check()
|
|||||||
if (PMA_getenv('PHP_AUTH_USER')) {
|
if (PMA_getenv('PHP_AUTH_USER')) {
|
||||||
$PHP_AUTH_USER = PMA_getenv('PHP_AUTH_USER');
|
$PHP_AUTH_USER = PMA_getenv('PHP_AUTH_USER');
|
||||||
} elseif (PMA_getenv('REMOTE_USER')) {
|
} elseif (PMA_getenv('REMOTE_USER')) {
|
||||||
// CGI, might be encoded, see bellow
|
// CGI, might be encoded, see below
|
||||||
$PHP_AUTH_USER = PMA_getenv('REMOTE_USER');
|
$PHP_AUTH_USER = PMA_getenv('REMOTE_USER');
|
||||||
|
} elseif (PMA_getenv('REDIRECT_REMOTE_USER')) {
|
||||||
|
// CGI, might be encoded, see below
|
||||||
|
$PHP_AUTH_USER = PMA_getenv('REDIRECT_REMOTE_USER');
|
||||||
} elseif (PMA_getenv('AUTH_USER')) {
|
} elseif (PMA_getenv('AUTH_USER')) {
|
||||||
// WebSite Professional
|
// WebSite Professional
|
||||||
$PHP_AUTH_USER = PMA_getenv('AUTH_USER');
|
$PHP_AUTH_USER = PMA_getenv('AUTH_USER');
|
||||||
} elseif (PMA_getenv('HTTP_AUTHORIZATION')) {
|
} elseif (PMA_getenv('HTTP_AUTHORIZATION')) {
|
||||||
// IIS, might be encoded, see bellow
|
// IIS, might be encoded, see below
|
||||||
$PHP_AUTH_USER = PMA_getenv('HTTP_AUTHORIZATION');
|
$PHP_AUTH_USER = PMA_getenv('HTTP_AUTHORIZATION');
|
||||||
} elseif (PMA_getenv('Authorization')) {
|
} elseif (PMA_getenv('Authorization')) {
|
||||||
// FastCGI, might be encoded, see bellow
|
// FastCGI, might be encoded, see below
|
||||||
$PHP_AUTH_USER = PMA_getenv('Authorization');
|
$PHP_AUTH_USER = PMA_getenv('Authorization');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user