bug #15263 [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() (axiac)

stof · stof · commit 328ec0133ee4 · 2015-08-03T19:22:19.000+02:00
This PR was squashed before being merged into the 2.3 branch (closes #15263). Discussion ---------- [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() | Q | A | ------------- | --- | Fixed tickets | #15262 | License | MIT 'proxy-revalidate' is not a header on its own but a 'Cache-Control' directive See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 Commits ------- 6c22f0a [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -587,7 +587,7 @@ public function setPublic()
      */
     public function mustRevalidate()
     {
-        return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->has('proxy-revalidate');
+        return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->hasCacheControlDirective('proxy-revalidate');
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -92,6 +92,22 @@ public function testMustRevalidate()
         $this->assertFalse($response->mustRevalidate());
     }
 
+    public function testMustRevalidateWithMustRevalidateCacheControlHeader()
+    {
+        $response = new Response();
+        $response->headers->set('cache-control', 'must-revalidate');
+
+        $this->assertTrue($response->mustRevalidate());
+    }
+
+    public function testMustRevalidateWithProxyRevalidateCacheControlHeader()
+    {
+        $response = new Response();
+        $response->headers->set('cache-control', 'proxy-revalidate');
+
+        $this->assertTrue($response->mustRevalidate());
+    }
+
     public function testSetNotModified()
     {
         $response = new Response();

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ public function setPublic()`
`587`	`587`	`*/`
`588`	`588`	`public function mustRevalidate()`
`589`	`589`	`{`
`590`		`- return $this->headers->hasCacheControlDirective('must-revalidate') \|\| $this->headers->has('proxy-revalidate');`
	`590`	`+ return $this->headers->hasCacheControlDirective('must-revalidate') \|\| $this->headers->hasCacheControlDirective('proxy-revalidate');`
`591`	`591`	`}`
`592`	`592`
`593`	`593`	`/**`