bug #62728 [HttpClient] mark response stale when age equals freshness lifetime (Lctrs)

nicolas-grekas · nicolas-grekas · commit 79820e8aa88e · 2025-12-11T08:31:30.000+01:00
This PR was merged into the 7.4 branch. Discussion ---------- [HttpClient] mark response stale when age equals freshness lifetime | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Issues | | License | MIT  Commits ------- 208a76d [HttpClient] mark response stale when age equals freshness lifetime
diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php
@@ -559,7 +559,7 @@ private function evaluateCacheFreshness(array $data): Freshness
         $now = time();
         $expires = $data['expires_at'];
 
-        if (null !== $expires && $now <= $expires) {
+        if (null !== $expires && $now < $expires) {
             return Freshness::Fresh;
         }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CachingHttpClientTest.php
@@ -172,9 +172,9 @@ public function testItDoesntServeAStaleResponse()
         self::assertSame(200, $response->getStatusCode());
         self::assertSame('foo', $response->getContent());
 
-        sleep(5);
+        sleep(4);
 
-        // After 5 seconds, the cached response is still considered valid.
+        // After 4 seconds, the cached response is still considered valid.
         $response = $client->request('GET', 'http://example.com/foo-bar');
         self::assertSame(200, $response->getStatusCode());
         self::assertSame('foo', $response->getContent());
@@ -954,14 +954,14 @@ public function testHeuristicFreshnessWithLastModified()
         self::assertSame('foo', $response->getContent());
 
         // Heuristic: 10% of 3600s = 360s; should be fresh within this time
-        sleep(360); // 5 minutes
+        sleep(359); // 5 minutes
 
         $response = $client->request('GET', 'http://example.com/heuristic');
         self::assertSame(200, $response->getStatusCode());
         self::assertSame('foo', $response->getContent());
 
         // After heuristic expires
-        sleep(1); // Total 361s, past 360s heuristic
+        sleep(2); // Total 361s, past 360s heuristic
 
         $response = $client->request('GET', 'http://example.com/heuristic');
         self::assertSame(200, $response->getStatusCode());

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ private function evaluateCacheFreshness(array $data): Freshness`
`559`	`559`	`$now = time();`
`560`	`560`	`$expires = $data['expires_at'];`
`561`	`561`
`562`		`- if (null !== $expires && $now <= $expires) {`
	`562`	`+ if (null !== $expires && $now < $expires) {`
`563`	`563`	`return Freshness::Fresh;`
`564`	`564`	`}`
`565`	`565`