|
|
|
@ -19,6 +19,7 @@ use Composer\Util\Http\Response;
|
|
|
|
|
use Composer\Composer;
|
|
|
|
|
use Composer\Package\Version\VersionParser;
|
|
|
|
|
use Composer\Semver\Constraint\Constraint;
|
|
|
|
|
use Composer\Exception\IrrecoverableDownloadException;
|
|
|
|
|
use React\Promise\Promise;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -257,10 +258,11 @@ class HttpDownloader
|
|
|
|
|
if (isset($job['curl_id'])) {
|
|
|
|
|
$curl->abortRequest($job['curl_id']);
|
|
|
|
|
}
|
|
|
|
|
throw new IrrecoverableDownloadException('Download of ' . Url::sanitize($job['request']['url']) . ' canceled');
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
$promise = new Promise($resolver, $canceler);
|
|
|
|
|
$promise->then(function ($response) use (&$job, $downloader) {
|
|
|
|
|
$promise = $promise->then(function ($response) use (&$job, $downloader) {
|
|
|
|
|
$job['status'] = HttpDownloader::STATUS_COMPLETED;
|
|
|
|
|
$job['response'] = $response;
|
|
|
|
|
|
|
|
|
@ -306,7 +308,7 @@ class HttpDownloader
|
|
|
|
|
if (isset($job['request']['options']['http']['header']) && false !== stripos(implode('', $job['request']['options']['http']['header']), 'if-modified-since')) {
|
|
|
|
|
$resolve(new Response(array('url' => $url), 304, array(), ''));
|
|
|
|
|
} else {
|
|
|
|
|
$e = new TransportException('Network disabled, request canceled: '.$url, 499);
|
|
|
|
|
$e = new TransportException('Network disabled, request canceled: '.Url::sanitize($url), 499);
|
|
|
|
|
$e->setStatusCode(499);
|
|
|
|
|
$reject($e);
|
|
|
|
|
}
|
|
|
|
@ -429,7 +431,7 @@ class HttpDownloader
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$io->writeError('<'.$type.'>'.ucfirst($type).' from '.$url.': '.$data[$type].'</'.$type.'>');
|
|
|
|
|
$io->writeError('<'.$type.'>'.ucfirst($type).' from '.Url::sanitize($url).': '.$data[$type].'</'.$type.'>');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|