[Dotenv] Get env using $_SERVER to work with fastcgi_param and workaround thread safety issues

nicolas-grekas · nicolas-grekas · commit 1e9c1c7cab94 · 2017-08-22T15:55:16.000+02:00
diff --git a/Container.php b/Container.php
@@ -438,13 +438,13 @@ protected function getEnv($name)
         if (isset($this->envCache[$name]) || array_key_exists($name, $this->envCache)) {
             return $this->envCache[$name];
         }
-        if (0 !== strpos($name, 'HTTP_') && isset($_SERVER[$name])) {
+        if (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
             return $this->envCache[$name] = $_SERVER[$name];
         }
         if (isset($_ENV[$name])) {
             return $this->envCache[$name] = $_ENV[$name];
         }
-        if (false !== $env = getenv($name)) {
+        if (false !== ($env = getenv($name)) && null !== $env) { // null is a possible value because of thread safety issues
             return $this->envCache[$name] = $env;
         }
         if (!$this->hasParameter("env($name)")) {

Original file line number	Diff line number	Diff line change
`@@ -438,13 +438,13 @@ protected function getEnv($name)`
`438`	`438`	`if (isset($this->envCache[$name]) \|\| array_key_exists($name, $this->envCache)) {`
`439`	`439`	`return $this->envCache[$name];`
`440`	`440`	`}`
`441`		`- if (0 !== strpos($name, 'HTTP_') && isset($_SERVER[$name])) {`
	`441`	`+ if (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {`
`442`	`442`	`return $this->envCache[$name] = $_SERVER[$name];`
`443`	`443`	`}`
`444`	`444`	`if (isset($_ENV[$name])) {`
`445`	`445`	`return $this->envCache[$name] = $_ENV[$name];`
`446`	`446`	`}`
`447`		`- if (false !== $env = getenv($name)) {`
	`447`	`+ if (false !== ($env = getenv($name)) && null !== $env) { // null is a possible value because of thread safety issues`
`448`	`448`	`return $this->envCache[$name] = $env;`
`449`	`449`	`}`
`450`	`450`	`if (!$this->hasParameter("env($name)")) {`