Skip to content

Commit

Permalink
Merge branch '4.4' into 5.1
Browse files Browse the repository at this point in the history
* 4.4:
  [HttpClient] fix using proxies with NativeHttpClient
  [4.4] Ignore more deprecations for Mockery mocks
  [Routing] fix using !important and defaults/reqs in inline route definitions
  [ErrorHandler][DebugClassLoader] Do not check Mockery mocks classes
  [HttpClient] Fix using https with proxies
  [TwigBundle] Only remove kernel exception listener if twig is used
  Adjust expired range check
  Fix redis connection error message
  • Loading branch information
nicolas-grekas committed Oct 2, 2020
2 parents 7abd647 + 9a1786e commit 8944cc8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,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();
}

/**
Expand Down

0 comments on commit 8944cc8

Please sign in to comment.