Merge pull request #8195 from dhensby/pulls/4.2/cache-default

FIX Default cache state should be `no-cache`
silverstripe · Jun 18, 2018 · 39a86e6 · 39a86e6
2 parents a3b1bf8 + 2f1c299
commit 39a86e6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Control/Middleware/HTTPCacheControlMiddleware.php b/src/Control/Middleware/HTTPCacheControlMiddleware.php
@@ -26,6 +26,8 @@ class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
 
     const STATE_DISABLED = 'disabled';
 
+    const STATE_DEFAULT = 'default';
+
     /**
      * Generate response for the given request
      *
@@ -90,6 +92,9 @@ public function process(HTTPRequest $request, callable $delegate)
         self::STATE_ENABLED => [
             'must-revalidate' => true,
         ],
+        self::STATE_DEFAULT => [
+            'no-cache' => true,
+        ],
     ];
 
     /**
@@ -98,7 +103,7 @@ public function process(HTTPRequest $request, callable $delegate)
      * @config
      * @var string
      */
-    protected static $defaultState = self::STATE_DISABLED;
+    protected static $defaultState = self::STATE_DEFAULT;
 
     /**
      * Current state