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

Catch all 4**/5** responses

pull/1191/merge
Jordi Boggiano 2012-10-18 17:09:23 +02:00
parent 32282e7461
commit 7d4857fc5b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,7 @@ class RemoteFilesystem
} }
$errorMessage = ''; $errorMessage = '';
$errorCode = 0;
set_error_handler(function ($code, $msg) use (&$errorMessage) { set_error_handler(function ($code, $msg) use (&$errorMessage) {
if ($errorMessage) { if ($errorMessage) {
$errorMessage .= "\n"; $errorMessage .= "\n";
@ -129,8 +130,9 @@ class RemoteFilesystem
} }
// fix for 5.4.0 https://bugs.php.net/bug.php?id=61336 // fix for 5.4.0 https://bugs.php.net/bug.php?id=61336
if (!empty($http_response_header[0]) && preg_match('{^HTTP/\S+ 404}i', $http_response_header[0])) { if (!empty($http_response_header[0]) && preg_match('{^HTTP/\S+ ([45]\d\d)}i', $http_response_header[0], $match)) {
$result = false; $result = false;
$errorCode = $match[1];
} }
// decode gzip // decode gzip
@ -181,7 +183,12 @@ class RemoteFilesystem
} }
if (false === $this->result) { if (false === $this->result) {
throw new TransportException('The "'.$fileUrl.'" file could not be downloaded: '.$errorMessage); $e = new TransportException('The "'.$fileUrl.'" file could not be downloaded: '.$errorMessage, $errorCode);
if (!empty($http_response_header[0])) {
$e->setHeaders($http_response_header);
}
throw $e;
} }
} }