D19172.id.diff
No OneTemporary
Actions

Size

939 B

Referenced Files

None

Subscribers

None

D19172.id.diff
View Options

	diff --git a/src/aphront/response/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
	--- a/src/aphront/response/AphrontResponse.php
	+++ b/src/aphront/response/AphrontResponse.php
	@@ -103,9 +103,20 @@
	return null;
	}

	- $csp = array();
	+ // NOTE: We may return a response during preflight checks (for example,
	+ // if a user has a bad version of PHP).
	+
	+ // In this case, setup isn't complete yet and we can't access environmental
	+ // configuration. If we aren't able to read the environment, just decline
	+ // to emit a Content-Security-Policy header.
	+
	+ try {
	+ $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
	+ } catch (Exception $ex) {
	+ return null;
	+ }

	- $cdn = PhabricatorEnv::getEnvConfig('security.alternate-file-domain');
	+ $csp = array();
	if ($cdn) {
	$default = $this->newContentSecurityPolicySource($cdn);
	} else {