From 3a6a3655b056da99dfb0ed673ae70ff6f0d30c7e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 17 May 2016 12:25:31 +0100 Subject: [PATCH 1/2] Update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a8c68d1..8fba689a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 143db7a9f5aef2ea0d9b6312aaac5c670013197c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 17 May 2016 14:08:14 +0100 Subject: [PATCH 2/2] Fix degraded mode usage on packagist, fixes #5350 --- src/Composer/Util/RemoteFilesystem.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php index 5c087158e..133521a39 100644 --- a/src/Composer/Util/RemoteFilesystem.php +++ b/src/Composer/Util/RemoteFilesystem.php @@ -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); }