symfony
diff --git a/‎src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
Lines changed: 20 additions & 7 deletions b/‎src/Symfony/Component/HttpKernel/HttpCache/ResponseCacheStrategy.php
Lines changed: 20 additions & 7 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php
Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/HttpCache/ResponseCacheStrategyTest.php
Lines changed: 20 additions & 0 deletions
@@ -30,6 +30,13 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
 {
     private $cacheable = true;
     private $embeddedResponses = 0;
+    private $cacheDirectives = array(
+        'no-cache' => false,
+        'no-store' => false,
+        'must-revalidate' => false,
+        'private' => false,
+        'proxy-revalidate' => false,
+    );
     private $ttls = array();
     private $maxAges = array();
     private $isNotCacheableResponseEmbedded = false;
@@ -41,6 +48,17 @@ public function add(Response $response)
     {
         if (!$response->isFresh() || !$response->isCacheable()) {
             $this->cacheable = false;
+
+            $hasCacheDirective = $response->headers->hasCacheControlDirective('public');
+            foreach ($this->cacheDirectives as $directive => $status) {
+                if ($response->headers->hasCacheControlDirective($directive)) {
+                    $this->cacheDirectives[$directive] = $hasCacheDirective = true;
+                }
+            }
+
+            if (!$hasCacheDirective || !$response->isFresh()) {
+                $this->cacheDirectives['no-cache'] = $this->cacheDirectives['must-revalidate'] = true;
+            }
         } else {
             $maxAge = $response->getMaxAge();
             $this->ttls[] = $response->getTtl();
@@ -72,19 +90,14 @@ public function update(Response $response)
             $response->setLastModified(null);
         }
 
-        if (!$response->isFresh()) {
-            $this->cacheable = false;
-        }
+        $this->add($response);
 
         if (!$this->cacheable) {
-            $response->headers->set('Cache-Control', 'no-cache, must-revalidate');
+            $response->headers->set('Cache-Control', implode(', ', array_keys(array_filter($this->cacheDirectives))));
 
             return;
         }
 
-        $this->ttls[] = $response->getTtl();
-        $this->maxAges[] = $response->getMaxAge();
-
         if ($this->isNotCacheableResponseEmbedded) {
             $response->headers->removeCacheControlDirective('s-maxage');
         } elseif (null !== $maxAge = min($this->maxAges)) {
 
@@ -219,4 +219,24 @@ public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombi
         $this->assertSame('60', $masterResponse->headers->getCacheControlDirective('s-maxage'));
         $this->assertFalse($masterResponse->isValidateable());
     }
+
+    public function testResponseIsPrivateWhenCombiningPrivateResponses()
+    {
+        $cacheStrategy = new ResponseCacheStrategy();
+
+        $masterResponse = new Response();
+        $masterResponse->setSharedMaxAge(60);
+        $masterResponse->setPrivate();
+
+        $embeddedResponse = new Response();
+        $embeddedResponse->setSharedMaxAge(60);
+        $embeddedResponse->setPrivate();
+
+        $cacheStrategy->add($embeddedResponse);
+        $cacheStrategy->update($masterResponse);
+
+        $this->assertFalse($masterResponse->headers->hasCacheControlDirective('no-cache'));
+        $this->assertFalse($masterResponse->headers->hasCacheControlDirective('must-revalidate'));
+        $this->assertTrue($masterResponse->headers->hasCacheControlDirective('private'));
+    }
 }