diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-18 15:21:43 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-18 15:21:43 -0500 |
| commit | dbd44e51a2a9c5c63a6211002e5dd3b14483fb60 (patch) | |
| tree | 56344401c6a541eca0b45ec01201faa9c52ce3f9 /lib/apiauth.php | |
| parent | 2ccd5187ccd509f3f579629186a7087720e5f94a (diff) | |
| parent | f1b3d84b7d55cc7c466982a95815ba1ddf130418 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/apiauth.php')
| -rw-r--r-- | lib/apiauth.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/apiauth.php b/lib/apiauth.php index 32502399f..17f803a1c 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -294,11 +294,15 @@ class ApiAuthAction extends ApiAction function basicAuthProcessHeader() { - if (isset($_SERVER['AUTHORIZATION']) - || isset($_SERVER['HTTP_AUTHORIZATION']) - ) { - $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION']) - ? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION']; + $authHeaders = array('AUTHORIZATION', + 'HTTP_AUTHORIZATION', + 'REDIRECT_HTTP_AUTHORIZATION'); // rewrite for CGI + $authorization_header = null; + foreach ($authHeaders as $header) { + if (isset($_SERVER[$header])) { + $authorization_header = $_SERVER[$header]; + break; + } } if (isset($_SERVER['PHP_AUTH_USER'])) { |