jjkiers
/
OAuth
1
0
Fork 0
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Merge 1249c00987 into 95477a7710

This commit is contained in:
Mauro Asprea 2015-12-17 03:08:30 +00:00
parent 95477a7710 1249c00987
commit 8969ec9106
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/JacobKiers/OAuth/Request/Request.php
View File

@ -93,10 +93,17 @@ class Request implements RequestInterface
public static function fromRequest($http_method = null, $http_url = null, $parameters = null) public static function fromRequest($http_method = null, $http_url = null, $parameters = null)
{ {
$scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on') ? 'http' : 'https'; $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on') ? 'http' : 'https';
$scheme = isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
? $_SERVER['HTTP_X_FORWARDED_PROTO']
: $scheme;
$port = isset($_SERVER['HTTP_X_FORWARDED_PORT'])
? $_SERVER['HTTP_X_FORWARDED_PORT']
: $_SERVER['SERVER_PORT'];
$http_url = ($http_url) ? $http_url : $scheme . $http_url = ($http_url) ? $http_url : $scheme .
'://' . $_SERVER['HTTP_HOST'] . '://' . $_SERVER['HTTP_HOST'] .
':' . ':' .
$_SERVER['SERVER_PORT'] . $port .
$_SERVER['REQUEST_URI']; $_SERVER['REQUEST_URI'];
$http_method = ($http_method) ? $http_method : $_SERVER['REQUEST_METHOD']; $http_method = ($http_method) ? $http_method : $_SERVER['REQUEST_METHOD'];