summaryrefslogtreecommitdiffstats
path: root/composer-sym4.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-03 08:38:52 +0200
committerRemi Collet <remi@remirepo.net>2021-06-03 08:38:52 +0200
commit2cd370aabcf647c1b34cdd15244882eed71348b0 (patch)
tree49b199c8ebc6f94f7821ab20f28e2fb3800de66c /composer-sym4.patch
parent20d88c6908557b0f060c93afff4034c10a8a5730 (diff)
update to 2.1.0-RC1
Diffstat (limited to 'composer-sym4.patch')
-rw-r--r--composer-sym4.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/composer-sym4.patch b/composer-sym4.patch
deleted file mode 100644
index f91ed86..0000000
--- a/composer-sym4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Adapted for v2.0.8 from
-
-From 2cb9630320370109a733b214049b6c2028712307 Mon Sep 17 00:00:00 2001
-From: Jordi Boggiano <j.boggiano@seld.be>
-Date: Tue, 26 Jan 2021 15:54:21 +0100
-Subject: [PATCH] Fix $_SERVER var not being updated when using putenv, refs
- b80038804ff791a9d4608d737ad937b6033b0bae and fixes #9372
-
-
-diff -up ./src/Composer/EventDispatcher/EventDispatcher.php.old ./src/Composer/EventDispatcher/EventDispatcher.php
---- ./src/Composer/EventDispatcher/EventDispatcher.php.old 2021-01-26 16:53:39.118387399 +0100
-+++ ./src/Composer/EventDispatcher/EventDispatcher.php 2021-01-26 16:54:45.679025338 +0100
-@@ -243,6 +243,8 @@ class EventDispatcher
-
- if (strpos($exec, '@putenv ') === 0) {
- putenv(substr($exec, 8));
-+ list($var, $value) = explode('=', substr($exec, 8), 2);
-+ $_SERVER[$var] = $value;
-
- continue;
- }
-diff -up ./src/Composer/Util/Git.php.old ./src/Composer/Util/Git.php
---- ./src/Composer/Util/Git.php.old 2021-01-26 16:53:11.000000000 +0100
-+++ ./src/Composer/Util/Git.php 2021-01-26 16:53:39.118387399 +0100
-@@ -354,7 +354,7 @@ class Git
- // added in git 1.7.1, prevents prompting the user for username/password
- if (getenv('GIT_ASKPASS') !== 'echo') {
- putenv('GIT_ASKPASS=echo');
-- unset($_SERVER['GIT_ASKPASS']);
-+ $_SERVER['GIT_ASKPASS'] = 'echo';
- }
-
- // clean up rogue git env vars in case this is running in a git hook
-@@ -370,6 +370,7 @@ class Git
- // Run processes with predictable LANGUAGE
- if (getenv('LANGUAGE') !== 'C') {
- putenv('LANGUAGE=C');
-+ $_SERVER['LANGUAGE'] = 'C';
- }
-
- // clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940