Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Allow the usage of "Expires: 0" header #107

Merged
merged 2 commits into from
Jan 25, 2017
Merged

Allow the usage of "Expires: 0" header #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6253e9b
Fixed the Expires: 0 header
ezimuel Jan 25, 2017
aa4ee94
Allow setting (int) 0 as Expires
ezimuel Jan 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Header/Expires.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

namespace Zend\Http\Header;

use DateTime;
use DateTimeZone;

/**
* Expires Header
*
Expand All @@ -25,4 +28,13 @@ public function getFieldName()
{
return 'Expires';
}


public function setDate($date)
{
if ($date === '0' || $date === 0) {
$date = date(DATE_W3C, 0); // Thu, 01 Jan 1970 00:00:00 GMT
}
return parent::setDate($date);
}
}
14 changes: 14 additions & 0 deletions test/Header/ExpiresTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,18 @@ public function testPreventsCRLFAttackViaFromString()
{
$header = Expires::fromString("Expires: Sun, 06 Nov 1994 08:49:37 GMT\r\n\r\nevilContent");
}

public function testExpiresSetToZero()
{
$expires = Expires::fromString("Expires: 0");
$this->assertEquals('Expires: Thu, 01 Jan 1970 00:00:00 GMT', $expires->toString());

$expires = new Expires();
$expires->setDate('0');
$this->assertEquals('Expires: Thu, 01 Jan 1970 00:00:00 GMT', $expires->toString());

$expires = new Expires();
$expires->setDate(0);
$this->assertEquals('Expires: Thu, 01 Jan 1970 00:00:00 GMT', $expires->toString());
}
}