Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2475001 by chris_hall_hu_cheng, jcnventura: Cache DateTime exception when Timezone not set

8.0.x
Alex Pott 2015-05-18 06:06:36 +01:00
parent 99aa2d6748
commit 8926759864
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/page_cache/src/StackMiddleware/PageCache.php
View File

@ -222,8 +222,8 @@ class PageCache implements HttpKernelInterface {
} }
// Use the actual timestamp from an Expires header, if available. // Use the actual timestamp from an Expires header, if available.
$date = $response->getExpires(); $date = $response->getExpires()->getTimestamp();
$expire = ($date > (new \DateTime())) ? $date->getTimestamp() : Cache::PERMANENT; $expire = ($date > time()) ? $date : Cache::PERMANENT;
$tags = explode(' ', $response->headers->get('X-Drupal-Cache-Tags')); $tags = explode(' ', $response->headers->get('X-Drupal-Cache-Tags'));
$this->set($request, $response, $expire, $tags); $this->set($request, $response, $expire, $tags);