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

Fix issue for PHP 5.4.8 where the host part from parse_url seems to also include the port as well.

Browse Source
This commit is contained in:
Gary Jones 2012-11-18 01:18:11 +00:00
parent dc7230cbb4
commit bebf65bfed
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GaryJones/OAuth/OAuthRequest.php
View File

@ -174,8 +174,16 @@ class OAuthRequest
$parts = parse_url($this->http_url); $parts = parse_url($this->http_url);
$scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http'; $scheme = (isset($parts['scheme'])) ? $parts['scheme'] : 'http';
$port = (isset($parts['port'])) ? $parts['port'] : (($scheme == 'https') ? '443' : '80'); $port = (isset($parts['port'])) ? $parts['port'] : '';
$host = (isset($parts['host'])) ? $parts['host'] : ''; if (isset($parts['host'])) {
// parse_url in PHP 5.4.8 includes the port in the host, so we need to strip it.
$host_and_maybe_port = explode(':', $parts['host']);
$host = $host_and_maybe_port[0];
} else {
$host = '';
}
// For PHP 5.4+, use:
// $host = (isset($parts['host'])) ? explode(':', $parts['host'])[0] : '';
$path = (isset($parts['path'])) ? $parts['path'] : ''; $path = (isset($parts['path'])) ? $parts['path'] : '';
if (($scheme == 'https' && $port != '443') if (($scheme == 'https' && $port != '443')