Remove the Expires header when calling Response::expire()
This commit is contained in:
parent
2ba0fa4a14
commit
ac0cd15402
|
@ -675,6 +675,7 @@ class Response
|
||||||
{
|
{
|
||||||
if ($this->isFresh()) {
|
if ($this->isFresh()) {
|
||||||
$this->headers->set('Age', $this->getMaxAge());
|
$this->headers->set('Age', $this->getMaxAge());
|
||||||
|
$this->headers->remove('Expires');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
|
|
|
@ -362,6 +362,11 @@ class ResponseTest extends ResponseTestCase
|
||||||
$response->headers->set('Expires', -1);
|
$response->headers->set('Expires', -1);
|
||||||
$response->expire();
|
$response->expire();
|
||||||
$this->assertNull($response->headers->get('Age'), '->expire() does not set the Age when the response is expired');
|
$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()
|
public function testGetTtl()
|
||||||
|
|
Reference in New Issue