diff --git a/ChangeLog b/ChangeLog index 307f1a4e9..5cac82797 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 2.11.2.0 (not yet released) - 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) diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 69b93df87..35635b030 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -101,16 +101,19 @@ function PMA_auth_check() if (PMA_getenv('PHP_AUTH_USER')) { $PHP_AUTH_USER = PMA_getenv('PHP_AUTH_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'); + } 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')) { // WebSite Professional $PHP_AUTH_USER = PMA_getenv('AUTH_USER'); } elseif (PMA_getenv('HTTP_AUTHORIZATION')) { - // IIS, might be encoded, see bellow + // IIS, might be encoded, see below $PHP_AUTH_USER = PMA_getenv('HTTP_AUTHORIZATION'); } elseif (PMA_getenv('Authorization')) { - // FastCGI, might be encoded, see bellow + // FastCGI, might be encoded, see below $PHP_AUTH_USER = PMA_getenv('Authorization'); } }