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

nicolas-grekas · nicolas-grekas · commit 091a67bdf3e3 · 2017-08-22T15:39:19.000+02:00
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -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($_SERVER[$name], 'HTTP_')) {
+                $value = $_SERVER[$name];
+            } elseif (isset($_ENV[$name])) {
+                $value = $_ENV[$name];
+            } else {
+                $value = (string) getenv($name);
+            }
 
             if (!$matches[2] && isset($matches[4])) {
                 $value .= '}';
