Merge pull request #107 from ezimuel/fix/expires-zero

Allow the usage of "Expires: 0" header
zendframework · Jan 25, 2017 · 78d1d96 · 78d1d96
2 parents 29402ee + aa4ee94
commit 78d1d96
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Header/Expires.php b/src/Header/Expires.php
@@ -9,6 +9,9 @@
 
 namespace Zend\Http\Header;
 
+use DateTime;
+use DateTimeZone;
+
 /**
  * Expires Header
  *
@@ -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);
+    }
 }
diff --git a/test/Header/ExpiresTest.php b/test/Header/ExpiresTest.php
@@ -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());
+    }
 }