diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
index 42e6bf2b8c634..c0fe501eeaac2 100644
--- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -54,7 +54,7 @@ public function set($key, $values, $replace = true)
parent::set($key, $values, $replace);
// ensure the cache-control header has sensible defaults
- if ('cache-control' === strtr(strtolower($key), '_', '-')) {
+ if (in_array(strtr(strtolower($key), '_', '-'), array('cache-control', 'etag', 'last-modified', 'expires'))) {
$computed = $this->computeCacheControlValue();
$this->headers['cache-control'] = array($computed);
$this->computedCacheControl = $this->parseCacheControl($computed);
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php b/tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
index ba15ff37c490a..1b0551531dc54 100644
--- a/tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
+++ b/tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
@@ -57,5 +57,9 @@ public function testCacheControlHeader()
$bag = new ResponseHeaderBag(array('cache-control' => 'public, max-age=100'));
$this->assertEquals('max-age=100, public', $bag->get('Cache-Control'));
+
+ $bag = new ResponseHeaderBag();
+ $bag->set('Last-Modified', 'abcde');
+ $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
}
}
diff --git a/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTest.php b/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTest.php
index d6a5ba7f2afaf..28ad9f60c6264 100644
--- a/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTest.php
+++ b/tests/Symfony/Tests/Component/HttpKernel/HttpCache/HttpCacheTest.php
@@ -168,6 +168,7 @@ public function testValidatesPrivateResponsesCachedOnTheClient()
$response->setContent('private data');
}
} else {
+ $response->headers->set('Cache-Control', 'public');
$response->setETag('"public tag"');
if (in_array('"public tag"', $etags)) {
$response->setStatusCode(304);
@@ -692,6 +693,7 @@ public function testReplacesCachedResponsesWhenValidationResultsInNon304Response
$this->setNextResponse(200, array(), 'Hello World', function ($request, $response) use ($time, &$count)
{
$response->headers->set('Last-Modified', $time->format(DATE_RFC2822));
+ $response->headers->set('Cache-Control', 'public');
switch (++$count) {
case 1:
$response->setContent('first response');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy