bug #28083 Remove the Expires header when calling Response::expire() (javiereguiluz)

fabpot · fabpot · commit d72dbbfbe0e3 · 2018-08-02T11:19:39.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- Remove the Expires header when calling Response::expire() | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #13341  | License | MIT | Doc PR | - Commits ------- ac0cd15402 Remove the Expires header when calling Response::expire()
diff --git a/Response.php b/Response.php
@@ -675,6 +675,7 @@ public function expire()
     {
         if ($this->isFresh()) {
             $this->headers->set('Age', $this->getMaxAge());
+            $this->headers->remove('Expires');
         }
 
         return $this;
diff --git a/Tests/ResponseTest.php b/Tests/ResponseTest.php
@@ -362,6 +362,11 @@ public function testExpire()
         $response->headers->set('Expires', -1);
         $response->expire();
         $this->assertNull($response->headers->get('Age'), '->expire() does not set the Age when the response is expired');
+
+        $response = new Response();
+        $response->headers->set('Expires', date(DATE_RFC2822, time() + 600));
+        $response->expire();
+        $this->assertNull($response->headers->get('Expires'), '->expire() removes the Expires header when the response is fresh');
     }
 
     public function testGetTtl()

Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,7 @@ public function expire()`
`675`	`675`	`{`
`676`	`676`	`if ($this->isFresh()) {`
`677`	`677`	`$this->headers->set('Age', $this->getMaxAge());`
	`678`	`+ $this->headers->remove('Expires');`
`678`	`679`	`}`
`679`	`680`
`680`	`681`	`return $this;`