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

Undo downgrade before trying again if http seems unreliable, refs #2835

pull/5380/merge
Jordi Boggiano 2016-06-24 14:58:32 +01:00
parent f94d06ff0a
commit ebae5dfd95
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Repository/ComposerRepository.php
View File

@ -644,6 +644,13 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$rfs = $preFileDownloadEvent->getRemoteFilesystem(); $rfs = $preFileDownloadEvent->getRemoteFilesystem();
$json = $rfs->getContents($hostname, $filename, false); $json = $rfs->getContents($hostname, $filename, false);
if ($sha256 && $sha256 !== hash('sha256', $json)) { if ($sha256 && $sha256 !== hash('sha256', $json)) {
// undo downgrade before trying again if http seems to be hijacked or modifying content somehow
if ($this->allowSslDowngrade) {
$this->url = str_replace('http://', 'https://', $this->url);
$this->baseUrl = str_replace('http://', 'https://', $this->baseUrl);
$filename = str_replace('http://', 'https://', $filename);
}
if ($retries) { if ($retries) {
usleep(100000); usleep(100000);