NEW Add better HTTP cache-control manipulation (silverstripe#8086)

silvermine · Jun 7, 2018 · 2b49540 · 2b49540
1 parent 1d0cffd
commit 2b49540
Show file tree

Hide file tree

Showing 20 changed files with 1,295 additions and 160 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -13,13 +13,19 @@ MySQLDatabase:
   collation: utf8_general_ci
 HTTP:
   cache_control:
-    max-age: 0
+    no-cache: "true"
+    no-store: "true"
     must-revalidate: "true"
-    no-transform: "true"
-  vary: "Cookie, X-Forwarded-Protocol, User-Agent, Accept"
+  vary: "X-Requested-With, X-Forwarded-Protocol"
 LeftAndMain:
   dependencies:
     versionProvider: %$SilverStripeVersionProvider
 SilverStripeVersionProvider:
   modules:
     silverstripe/framework: Framework
+---
+Only:
+  environment: dev
+---
+HTTP:
+  disable_http_cache: true
diff --git a/api/RSSFeed.php b/api/RSSFeed.php
@@ -204,10 +204,7 @@ public function outputToBrowser() {
 			HTTP::register_etag($this->etag);
 		}
 
-		if(!headers_sent()) {
-			HTTP::add_cache_headers();
-			$response->addHeader("Content-Type", "application/rss+xml; charset=utf-8");
-		}
+		$response->addHeader("Content-Type", "application/rss+xml; charset=utf-8");
 
 		Config::inst()->update('SSViewer', 'source_file_comments', $prevState);
 

diff --git a/control/Controller.php b/control/Controller.php
@@ -169,10 +169,7 @@ public function handleRequest(SS_HTTPRequest $request, DataModel $model) {
 			$response->setBody($body);
 		}
 
-
 		ContentNegotiator::process($response);
-		HTTP::add_cache_headers($response);
-
 		$this->popCurrent();
 		return $response;
 	}
@@ -502,7 +499,7 @@ public function redirect($url, $code=302) {
 	 */
 	public function redirectBack() {
 		// Don't cache the redirect back ever
-		HTTP::set_cache_age(0);
+		HTTPCacheControl::singleton()->disableCache(true);
 
 		$url = null;
 

diff --git a/control/Director.php b/control/Director.php
@@ -386,7 +386,14 @@ protected static function handleRequest(SS_HTTPRequest $request, Session $sessio
 					} catch(SS_HTTPResponse_Exception $responseException) {
 						$result = $responseException->getResponse();
 					}
-					if(!is_object($result) || $result instanceof SS_HTTPResponse) return $result;
+					// Ensure cache headers are added
+					if ($result instanceof SS_HTTPResponse) {
+						HTTP::add_cache_headers($result);
+						return $result;
+					}
+					if(!is_object($result)) {
+						return $result;
+					}
 
 					user_error("Bad result from url " . $request->getURL() . " handled by " .
 						get_class($controllerObj)." controller: ".get_class($result), E_USER_WARNING);

diff --git a/control/FlushRequestFilter.php b/control/FlushRequestFilter.php
@@ -18,6 +18,9 @@ public function preRequest(SS_HTTPRequest $request, Session $session, DataModel
 	}
 
 	public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
+		if(array_key_exists('flush', $request->getVars())) {
+			HTTPCacheControl::singleton()->disableCache(true);
+		}
 		return true;
 	}