public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Refactor to use new helper methods for headers

pull/4783/head
Chris Smith 2016-01-19 22:19:17 +00:00
parent 8a8ec6fccc
commit dd3216e93d
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Composer/Util/RemoteFilesystem.php
View File

@ -303,38 +303,28 @@ class RemoteFilesystem
$statusCode = $this->findStatusCode($http_response_header); $statusCode = $this->findStatusCode($http_response_header);
} }
if ($userlandFollow && !empty($http_response_header[0]) && preg_match('{^HTTP/\S+ (3\d\d)}i', $http_response_header[0], $match) && $this->redirects < $this->maxRedirects) { if ($userlandFollow && $statusCode >= 300 && $statusCode <= 399 && $this->redirects < $this->maxRedirects) {
foreach ($http_response_header as $header) { if ($locationHeader = $this->findHeaderValue($http_response_header, 'location')) {
if (preg_match('{^location: *(.+) *$}i', $header, $m)) { if (parse_url($locationHeader, PHP_URL_SCHEME)) {
if (parse_url($m[1], PHP_URL_SCHEME)) { // Absolute URL; e.g. https://example.com/composer
$targetUrl = $m[1]; $targetUrl = $locationHeader;
} elseif (parse_url($locationHeader, PHP_URL_HOST)) {
break;
}
if (parse_url($m[1], PHP_URL_HOST)) {
// Scheme relative; e.g. //example.com/foo // Scheme relative; e.g. //example.com/foo
$targetUrl = $this->scheme.':'.$m[1]; $targetUrl = $this->scheme.':'.$locationHeader;
break; } elseif ('/' === $locationHeader[0]) {
}
if ('/' === $m[1][0]) {
// Absolute path; e.g. /foo // Absolute path; e.g. /foo
$urlHost = parse_url($this->fileUrl, PHP_URL_HOST); $urlHost = parse_url($this->fileUrl, PHP_URL_HOST);
// Replace path using hostname as an anchor. // Replace path using hostname as an anchor.
$targetUrl = preg_replace('{^(.+(?://|@)'.preg_quote($urlHost).')(?:[/\?].*)?$}', '\1'.$m[1], $this->fileUrl); $targetUrl = preg_replace('{^(.+(?://|@)'.preg_quote($urlHost).')(?:[/\?].*)?$}', '\1'.$locationHeader, $this->fileUrl);
} } else {
// Relative path; e.g. foo // Relative path; e.g. foo
// This actually differs from PHP which seems to add duplicate slashes. // This actually differs from PHP which seems to add duplicate slashes.
$targetUrl = preg_replace('{^(.+/)[^/?]*(?:\?.*)?$}', '\1'.$m[1], $this->fileUrl); $targetUrl = preg_replace('{^(.+/)[^/?]*(?:\?.*)?$}', '\1'.$locationHeader, $this->fileUrl);
break;
} }
} }
if ($targetUrl) { if (!empty($targetUrl)) {
$this->redirects++; $this->redirects++;
// TODO: Disabled because this is (probably) different behaviour to PHP following for us. // TODO: Disabled because this is (probably) different behaviour to PHP following for us.