ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-12-23 13:39:48 +05:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:thephpleague/oauth2-server into develop

Browse Source
This commit is contained in:
Alex Bilbie 2014-07-23 16:05:42 +01:00
commit 1890d71838
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/League/OAuth2/Server/Resource.php
View File

@ -165,7 +165,7 @@ class Resource
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
if ($error === 'invalid_token') { if ($error === 'invalid_token') {
$authScheme = null; $authScheme = null;
$request = new Request(); $request = Request::buildFromGlobals();
if ($request->server('PHP_AUTH_USER') !== null) { if ($request->server('PHP_AUTH_USER') !== null) {
$authScheme = 'Basic'; $authScheme = 'Basic';
} else { } else {

9
src/League/OAuth2/Server/Util/Request.php
View File

@ -76,15 +76,18 @@ class Request implements RequestInterface
protected function readHeaders() protected function readHeaders()
{ {
if (function_exists('getallheaders')) { if (function_exists('apache_request_headers')) {
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
$headers = getallheaders(); $headers = apache_request_headers();
} elseif (function_exists('http_get_request_headers')) {
$headers = http_get_request_headers();
} else { } else {
// @codeCoverageIgnoreEnd // @codeCoverageIgnoreEnd
$headers = array(); $headers = array();
foreach ($this->server() as $name => $value) { foreach ($this->server() as $name => $value) {
if (substr($name, 0, 5) == 'HTTP_') { if (substr($name, 0, 5) == 'HTTP_') {
$name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5))))); // HTTP_FOO_BAR becomes FOO-BAR
$name = str_replace(array('HTTP_', '_'), array('', '-'), $name);
$headers[$name] = $value; $headers[$name] = $value;
} }
} }