17139: do not send default cache header for 301 redirects

e-moe · e-moe · commit 6db566dbd96f · 2016-03-18T08:39:49.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -310,6 +310,11 @@ public function prepare(Request $request)
             $this->headers->set('expires', -1);
         }
 
+        // Don't send default cache header for 301 redirects
+        if (301 == $this->statusCode && !array_key_exists('cache-control', $this->headers)) {
+            $this->headers->remove('cache-control');
+        }
+
         $this->ensureIEOverSSLCompatibility($request);
 
         return $this;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -544,6 +544,14 @@ public function testPrepareRemovesContentLength()
         $this->assertFalse($response->headers->has('Content-Length'));
     }
 
+    public function testPrepareRemovesDefaultCacheHeaderForPermanentRedirect()
+    {
+        $response = new Response('foo', 301);
+        $request = Request::create('/');
+        $response->prepare($request);
+        $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));
+    }
+
     public function testPrepareSetsPragmaOnHttp10Only()
     {
         $request = Request::create('/', 'GET');

Original file line number	Diff line number	Diff line change
`@@ -544,6 +544,14 @@ public function testPrepareRemovesContentLength()`
`544`	`544`	`$this->assertFalse($response->headers->has('Content-Length'));`
`545`	`545`	`}`
`546`	`546`
	`547`	`+ public function testPrepareRemovesDefaultCacheHeaderForPermanentRedirect()`
	`548`	`+ {`
	`549`	`+ $response = new Response('foo', 301);`
	`550`	`+ $request = Request::create('/');`
	`551`	`+ $response->prepare($request);`
	`552`	`+ $this->assertFalse($response->headers->hasCacheControlDirective('no-cache'));`
	`553`	`+ }`
	`554`	`+`
`547`	`555`	`public function testPrepareSetsPragmaOnHttp10Only()`
`548`	`556`	`{`
`549`	`557`	`$request = Request::create('/', 'GET');`