[HttpClient] Allow the HTTP_PROXY environment variable lookup with phpdbg

theofidry · nicolas-grekas · commit fbd439e0bd1f · 2019-04-08T17:24:39.000+02:00
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -258,7 +258,7 @@ private static function getProxy(?string $proxy, array $url): ?array
     {
         if (null === $proxy) {
             // Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities
-            $proxy = $_SERVER['http_proxy'] ?? ('cli' === \PHP_SAPI ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;
+            $proxy = $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;
 
             if ('https:' === $url['scheme']) {
                 $proxy = $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? $proxy;

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ private static function getProxy(?string $proxy, array $url): ?array`
`258`	`258`	`{`
`259`	`259`	`if (null === $proxy) {`
`260`	`260`	`// Ignore HTTP_PROXY except on the CLI to work around httpoxy set of vulnerabilities`
`261`		`- $proxy = $_SERVER['http_proxy'] ?? ('cli' === \PHP_SAPI ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;`
	`261`	`+ $proxy = $_SERVER['http_proxy'] ?? (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? $_SERVER['HTTP_PROXY'] ?? null : null) ?? $_SERVER['all_proxy'] ?? $_SERVER['ALL_PROXY'] ?? null;`
`262`	`262`
`263`	`263`	`if ('https:' === $url['scheme']) {`
`264`	`264`	`$proxy = $_SERVER['https_proxy'] ?? $_SERVER['HTTPS_PROXY'] ?? $proxy;`