Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 9a1786e50207 · 2020-10-02T10:38:15.000+02:00
* 3.4:
  Adjust expired range check
diff --git a/Cookie.php b/Cookie.php
@@ -309,7 +309,7 @@ public function isHttpOnly()
      */
     public function isExpired()
     {
-        return null !== $this->expires && 0 != $this->expires && $this->expires < time();
+        return null !== $this->expires && 0 != $this->expires && $this->expires <= time();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public function isHttpOnly()`
`309`	`309`	`*/`
`310`	`310`	`public function isExpired()`
`311`	`311`	`{`
`312`		`- return null !== $this->expires && 0 != $this->expires && $this->expires < time();`
	`312`	`+ return null !== $this->expires && 0 != $this->expires && $this->expires <= time();`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`/**`