[HttpFoundation] Combine Cache-Control headers

c960657 · c960657 · commit 1f76a70b6f2c · 2017-10-08T16:27:20.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -146,7 +146,7 @@ public function set($key, $values, $replace = true)
         }
 
         if ('cache-control' === $key) {
-            $this->cacheControl = $this->parseCacheControl($values[0]);
+            $this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
         }
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -110,6 +110,17 @@ public function testCacheControlHeader()
         $bag = new ResponseHeaderBag();
         $bag->set('Last-Modified', 'abcde');
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Cache-Control', array('public', 'must-revalidate'));
+        $this->assertCount(1, $bag->get('Cache-Control', null, false));
+        $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
+
+        $bag = new ResponseHeaderBag();
+        $bag->set('Cache-Control', 'public');
+        $bag->set('Cache-Control', 'must-revalidate', false);
+        $this->assertCount(1, $bag->get('Cache-Control', null, false));
+        $this->assertEquals('must-revalidate, public', $bag->get('Cache-Control'));
     }
 
     public function testToStringIncludesCookieHeaders()

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function set($key, $values, $replace = true)`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if ('cache-control' === $key) {`
`149`		`- $this->cacheControl = $this->parseCacheControl($values[0]);`
	`149`	`+ $this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`