symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Container.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Container.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Dotenv/Dotenv.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dotenv/Dotenv.php
+11-2Lines changed: 11 additions & 2 deletions b/‎src/Symfony/Component/Dotenv/Dotenv.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Dotenv/Dotenv.php
+11-2Lines changed: 11 additions & 2 deletions
@@ -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)")) {
 
@@ -70,7 +70,8 @@ public function populate($values)
         unset($loadedVars['']);
 
         foreach ($values as $name => $value) {
-            if (!isset($loadedVars[$name]) && (isset($_ENV[$name]) || isset($_SERVER[$name]) || false !== getenv($name))) {
+            // don't check existence with getenv() because of thread safety issues
+            if (!isset($loadedVars[$name]) && (isset($_ENV[$name]) || isset($_SERVER[$name]))) {
                 continue;
             }
 
@@ -363,7 +364,15 @@ private function resolveVariables($value)
             }
 
             $name = $matches[3];
-            $value = isset($this->values[$name]) ? $this->values[$name] : (isset($_ENV[$name]) ? $_ENV[$name] : (string) getenv($name));
+            if (isset($this->values[$name])) {
+                $value = $this->values[$name];
+            } elseif (isset($_SERVER[$name]) && 0 !== strpos($name, 'HTTP_')) {
+                $value = $_SERVER[$name];
+            } elseif (isset($_ENV[$name])) {
+                $value = $_ENV[$name];
+            } else {
+                $value = (string) getenv($name);
+            }
 
             if (!$matches[2] && isset($matches[4])) {
                 $value .= '}';
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)")) {`