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

Merge branch '1.1'

pull/5360/head
Jordi Boggiano 2016-05-17 14:08:17 +01:00
parent 57ae6d97b6 143db7a9f5
commit 32a8a60695
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,3 +1,11 @@
### [1.1.1] - 2016-05-17
* Fixed regression in handling of #reference which made it update every time
* Fixed dev platform requirements being required even in --no-dev install from a lock file
* Fixed parsing of extension versions that do not follow valid numbers, we now try to parse x.y.z and ignore the rest
* Fixed exact constraints warnings appearing for 0.x versions
* Fixed regression in the `remove` command
### [1.1.0] - 2016-05-10
* Added fallback to SSH for https bitbucket URLs
@ -382,6 +390,8 @@
* Initial release
[1.1.1]: https://github.com/composer/composer/compare/1.1.0...1.1.1
[1.1.0]: https://github.com/composer/composer/compare/1.0.3...1.1.0
[1.1.0-RC]: https://github.com/composer/composer/compare/1.0.3...1.1.0-RC
[1.0.3]: https://github.com/composer/composer/compare/1.0.2...1.0.3
[1.0.2]: https://github.com/composer/composer/compare/1.0.1...1.0.2

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

@ -249,6 +249,7 @@ class RemoteFilesystem
if ($this->degradedMode && substr($fileUrl, 0, 21) === 'http://packagist.org/') {
// access packagist using the resolved IPv4 instead of the hostname to force IPv4 protocol
$fileUrl = 'http://' . gethostbyname('packagist.org') . substr($fileUrl, 20);
$degradedPackagist = true;
}
$ctx = StreamContextFactory::getContext($fileUrl, $options, array('notification' => array($this, 'callbackGet')));
@ -259,7 +260,7 @@ class RemoteFilesystem
unset($origFileUrl, $actualContextOptions);
// Check for secure HTTP, but allow insecure Packagist calls to $hashed providers as file integrity is verified with sha256
if ((substr($fileUrl, 0, 23) !== 'http://packagist.org/p/' || (false === strpos($fileUrl, '$') && false === strpos($fileUrl, '%24'))) && $this->config) {
if ((substr($fileUrl, 0, 23) !== 'http://packagist.org/p/' || (false === strpos($fileUrl, '$') && false === strpos($fileUrl, '%24'))) && empty($degradedPackagist) && $this->config) {
$this->config->prohibitUrlByConfig($fileUrl, $this->io);
}