bug #33853 [HttpClient] fix "no_proxy" option ignored in NativeHttpClient (Harry-Dunne)

nicolas-grekas · nicolas-grekas · commit 11248098957a · 2019-10-04T22:46:01.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] fix "no_proxy" option ignored in NativeHttpClient | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #33832 | License | MIT | Doc PR | Allow overriding of no_proxy environment variable by passing no_proxy option in NativeHttpClient::request() method. Commits ------- e4fb58d [HttpClient] Fixed #33832 NO_PROXY option ignored in NativeHttpClient::request() method
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -203,7 +203,7 @@ public function request(string $method, string $url, array $options = []): Respo
         ];
 
         $proxy = self::getProxy($options['proxy'], $url);
-        $noProxy = $_SERVER['no_proxy'] ?? $_SERVER['NO_PROXY'] ?? '';
+        $noProxy = $options['no_proxy'] ?? $_SERVER['no_proxy'] ?? $_SERVER['NO_PROXY'] ?? '';
         $noProxy = $noProxy ? preg_split('/[\s,]+/', $noProxy) : [];
 
         $resolveRedirect = self::createRedirectResolver($options, $host, $proxy, $noProxy, $info, $onProgress);
