From 40a35abb9423e16f8bafcb1ed1b7e027881b0422 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Fri, 10 Apr 2020 12:24:43 +0200
Subject: [PATCH] Resolve options when creating requests to fix 5.3 build

---
 src/Composer/Util/HttpDownloader.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Composer/Util/HttpDownloader.php b/src/Composer/Util/HttpDownloader.php
index 26c181a00..2fa8fa716 100644
--- a/src/Composer/Util/HttpDownloader.php
+++ b/src/Composer/Util/HttpDownloader.php
@@ -129,6 +129,8 @@ class HttpDownloader
 
     private function addJob($request, $sync = false)
     {
+        $request['options'] = array_replace_recursive($this->options, $request['options']);
+
         $job = array(
             'id' => $this->idGen++,
             'status' => self::STATUS_QUEUED,
@@ -155,7 +157,6 @@ class HttpDownloader
                 // start job
                 $url = $job['request']['url'];
                 $options = $job['request']['options'];
-                $options = array_replace_recursive($this->options, $options);
 
                 $job['status'] = HttpDownloader::STATUS_STARTED;
 
@@ -237,8 +238,6 @@ class HttpDownloader
             return;
         }
 
-        $options = array_replace_recursive($this->options, $options);
-
         if ($job['request']['copyTo']) {
             $this->curl->download($resolve, $reject, $origin, $url, $options, $job['request']['copyTo']);
         } else {