symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
+4Lines changed: 4 additions & 0 deletions b/‎tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
+4Lines changed: 4 additions & 0 deletions
@@ -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);
 
@@ -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'));
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,9 @@ public function testCacheControlHeader()`
`57`	`57`
`58`	`58`	`$bag = new ResponseHeaderBag(array('cache-control' => 'public, max-age=100'));`
`59`	`59`	`$this->assertEquals('max-age=100, public', $bag->get('Cache-Control'));`
	`60`	`+`
	`61`	`+ $bag = new ResponseHeaderBag();`
	`62`	`+ $bag->set('Last-Modified', 'abcde');`
	`63`	`+ $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));`
`60`	`64`	`}`
`61`	`65`	`}`