Fix StaticController::setCacheHeader() not using $maxAge

This commit is contained in:
Eric Lippmann 2015-08-27 14:13:03 +02:00
parent 3dd58a6ca7
commit 22b628c084

View File

@ -121,7 +121,7 @@ class StaticController extends Controller
} }
$response = $this->getResponse(); $response = $this->getResponse();
$response->setHeader('Content-Type', 'text/javascript'); $response->setHeader('Content-Type', 'text/javascript');
$this->setCacheHeader(3600); $this->setCacheHeader();
$response->setHeader( $response->setHeader(
'Last-Modified', 'Last-Modified',
@ -135,22 +135,22 @@ class StaticController extends Controller
} }
/** /**
* Set cache header for this response * Set cache header for the response
* *
* @param integer $maxAge The maximum age to set * @param int $maxAge The maximum age to set
*/ */
private function setCacheHeader($maxAge) private function setCacheHeader($maxAge = 3600)
{ {
$this->_response->setHeader('Cache-Control', 'max-age=3600', true); $maxAge = (int) $maxAge;
$this->_response->setHeader('Pragma', 'cache', true); $this
$this->_response->setHeader( ->getResponse()
'Expires', ->setHeader('Cache-Control', sprintf('max-age=%d', $maxAge), true)
gmdate( ->setHeader('Pragma', 'cache', true)
'D, d M Y H:i:s', ->setHeader(
time()+3600 'Expires',
) . ' GMT', gmdate('D, d M Y H:i:s', time() + $maxAge) . ' GMT',
true true
); );
} }
/** /**