wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16788 from nextcloud/enh/no_response_constructor

Browse source 
Do not enforce the parent constructor of response to be called
This commit is contained in:
Roeland Jago Douma 2019-08-19 15:53:03 +02:00 committed by GitHub
commit 1521da14ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/public/AppFramework/Http/Response.php
View file

@ -93,13 +93,9 @@ class Response {
private $throttleMetadata = [];
/**
* Response constructor.
*
* @since 17.0.0
*/
public function __construct() {
$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
$this->setFeaturePolicy(new EmptyFeaturePolicy());
}
/**
@ -241,12 +237,8 @@ class Response {
$this->lastModified->format(\DateTime::RFC2822);
}
// Build Content-Security-Policy and use default if none has been specified
if(is_null($this->contentSecurityPolicy)) {
$this->setContentSecurityPolicy(new ContentSecurityPolicy());
}
$this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy();
$this->headers['Feature-Policy'] = $this->featurePolicy->buildPolicy();
$this->headers['Content-Security-Policy'] = $this->getContentSecurityPolicy()->buildPolicy();
$this->headers['Feature-Policy'] = $this->getFeaturePolicy()->buildPolicy();
if($this->ETag) {
$mergeWith['ETag'] = '"' . $this->ETag . '"';
@ -296,6 +288,9 @@ class Response {
* @since 8.1.0
*/
public function getContentSecurityPolicy() {
if ($this->contentSecurityPolicy === null) {
$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
}
return $this->contentSecurityPolicy;
}
@ -304,6 +299,9 @@ class Response {
* @since 17.0.0
*/
public function getFeaturePolicy(): EmptyFeaturePolicy {
if ($this->featurePolicy === null) {
$this->setFeaturePolicy(new EmptyFeaturePolicy());
}
return $this->featurePolicy;
}