tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup ETag middleware

Browse Source
This commit is contained in:
Daniel Hensby 2018-06-13 14:29:37 +01:00
parent 0b308c871d
commit 17ad985925
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Control/Middleware/ETagMiddleware.php
View File

@ -8,13 +8,6 @@ use SilverStripe\Core\Injector\Injectable;
/** /**
* Generates and handle responses for etag header. * Generates and handle responses for etag header.
*
* Chrome ignores Varies when redirecting back (http://code.google.com/p/chromium/issues/detail?id=79758)
* which means that if you log out, you get redirected back to a page which Chrome then checks against
* last-modified (which passes, getting a 304)
* when it shouldn't be trying to use that page at all because it's the "logged in" version.
* By also using and etag that includes both the modification date and all the varies
* values which we also check against we can catch this and not return a 304
*/ */
class ETagMiddleware implements HTTPMiddleware class ETagMiddleware implements HTTPMiddleware
{ {
@ -45,7 +38,7 @@ class ETagMiddleware implements HTTPMiddleware
// Check if we have a match // Check if we have a match
$ifNoneMatch = $request->getHeader('If-None-Match'); $ifNoneMatch = $request->getHeader('If-None-Match');
if ($ifNoneMatch && $ifNoneMatch === $etag) { if ($ifNoneMatch === $etag) {
return $this->sendNotModified($request, $response); return $this->sendNotModified($request, $response);
} }
} }
@ -67,18 +60,12 @@ class ETagMiddleware implements HTTPMiddleware
protected function generateETag(HTTPResponse $response) protected function generateETag(HTTPResponse $response)
{ {
// Existing e-tag // Existing e-tag
if ($response instanceof HTTPResponse && $response->getHeader('ETag')) { if ($etag = $response->getHeader('ETag')) {
return $response->getHeader('ETag'); return $etag;
} }
// Generate etag from body // Generate etag from body
$body = $response instanceof HTTPResponse return sprintf('"%s"', md5($response->getBody()));
? $response->getBody()
: $response;
if ($body) {
return sprintf('"%s"', md5($body));
}
return false;
} }
/** /**