tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 06:09:00 +02:00
Code Issues Projects Releases Wiki Activity

State default should be state enabled (no-cache is an enabled state)

Browse Source
This commit is contained in:
Daniel Hensby 2018-07-06 11:48:06 +01:00 committed by Daniel Hensby
parent 601bb4d768
commit fd8448889c
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Control/Middleware/HTTPCacheControlMiddleware.php
View File

@ -26,8 +26,6 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
const STATE_DISABLED = 'disabled'; const STATE_DISABLED = 'disabled';
const STATE_DEFAULT = 'default';
/** /**
* Generate response for the given request * Generate response for the given request
* *
@ -90,12 +88,9 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
'must-revalidate' => true, 'must-revalidate' => true,
], ],
self::STATE_ENABLED => [ self::STATE_ENABLED => [
'must-revalidate' => true,
],
self::STATE_DEFAULT => [
'no-cache' => true, 'no-cache' => true,
'must-revalidate' => true, 'must-revalidate' => true,
], ]
]; ];
/** /**
@ -104,7 +99,7 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
* @config * @config
* @var string * @var string
*/ */
private static $defaultState = self::STATE_DEFAULT; private static $defaultState = self::STATE_ENABLED;
/** /**
* Current state * Current state
@ -520,7 +515,7 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
public function setMaxAge($age) public function setMaxAge($age)
{ {
// Affect all non-disabled states // Affect all non-disabled states
$applyTo = [self::STATE_ENABLED, self::STATE_PRIVATE, self::STATE_PUBLIC, self::STATE_DEFAULT]; $applyTo = [self::STATE_ENABLED, self::STATE_PRIVATE, self::STATE_PUBLIC];
$this->setStateDirective($applyTo, 'max-age', $age); $this->setStateDirective($applyTo, 'max-age', $age);
if ($age) { if ($age) {
$this->removeStateDirective($applyTo, 'no-cache'); $this->removeStateDirective($applyTo, 'no-cache');
@ -540,7 +535,7 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
public function setSharedMaxAge($age) public function setSharedMaxAge($age)
{ {
// Affect all non-disabled states // Affect all non-disabled states
$applyTo = [self::STATE_ENABLED, self::STATE_PRIVATE, self::STATE_PUBLIC, self::STATE_DEFAULT]; $applyTo = [self::STATE_ENABLED, self::STATE_PRIVATE, self::STATE_PUBLIC];
$this->setStateDirective($applyTo, 's-maxage', $age); $this->setStateDirective($applyTo, 's-maxage', $age);
if ($age) { if ($age) {
$this->removeStateDirective($applyTo, 'no-cache'); $this->removeStateDirective($applyTo, 'no-cache');
@ -558,7 +553,7 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
*/ */
public function setMustRevalidate($mustRevalidate = true) public function setMustRevalidate($mustRevalidate = true)
{ {
$applyTo = [self::STATE_ENABLED, self::STATE_PRIVATE, self::STATE_PUBLIC, self::STATE_DEFAULT]; $applyTo = [self::STATE_ENABLED, self::STATE_PRIVATE, self::STATE_PUBLIC];
$this->setStateDirective($applyTo, 'must-revalidate', $mustRevalidate); $this->setStateDirective($applyTo, 'must-revalidate', $mustRevalidate);
return $this; return $this;
} }