D12571.id30182.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D12571.id30182.diff
View Options

	diff --git a/support/PhabricatorStartup.php b/support/PhabricatorStartup.php
	--- a/support/PhabricatorStartup.php
	+++ b/support/PhabricatorStartup.php
	@@ -425,7 +425,8 @@
	$_POST = array_merge($_POST, $filtered);
	break;
	case INPUT_ENV;
	- $_ENV = array_merge($_ENV, $filtered);
	+ $env = array_merge($_ENV, $filtered);
	+ $_ENV = self::filterEnvSuperglobal($env);
	break;
	}
	}
	@@ -458,6 +459,30 @@
	}
	}

	+
	+ /**
	+ * Adjust `$_ENV` before execution.
	+ *
	+ * Adjustments here primarily impact the environment as seen by subprocesses.
	+ * The environment is forwarded explicitly by @{class:ExecFuture}.
	+ *
	+ * @param map<string, wild> Input `$_ENV`.
	+ * @return map<string, string> Suitable `$_ENV`.
	+ * @task validation
	+ */
	+ private static function filterEnvSuperglobal(array $env) {
	+
	+ // In some configurations, we may get "argc" and "argv" set in $_ENV.
	+ // These are not real environmental variables, and "argv" may have an array
	+ // value which can not be forwarded to subprocesses. Remove these from the
	+ // environment if they are present.
	+ unset($env['argc']);
	+ unset($env['argv']);
	+
	+ return $env;
	+ }
	+
	+
	/**
	* @task validation
	*/